diff --git a/README b/README
new file mode 100644
index 0000000..35e205d
--- /dev/null
+++ b/README
@@ -0,0 +1,56 @@
+Gemeinschaft - CallerID addon
+
+(c)2009 Markus Birth <markus@birth-online.de>
+
+
+1. INSTALLATION
+
+- copy the directories dialplan-scripts and inc to /opt/gemeinschaft
+- open the file /etc/asterisk/e-internal.ael
+- find the context to-internal-users-self (around line 478)
+- in there, find the to_user: section
+- before the Dial() command (around line 731), add the following line:
+
+  AGI(/opt/gemeinschaft/dialplan-scripts/in-get-callerid.agi,${CALLERID(num)});
+
+  so that it looks like this:
+
+  AGI(/opt/gemeinschaft/dialplan-scripts/in-get-callerid.agi,${CALLERID(num)});
+  Dial(SIP/${EXTEN}${pgrpdialstr},${dialtimeout});
+
+- somewhat further down find the to_queue: section
+- before the Queue() command (around line 912), add the line from above so that it looks like this:
+
+  AGI(/opt/gemeinschaft/dialplan-scripts/in-get-callerid.agi,${CALLERID(num)});
+  Set(queue_entertime=${EPOCH});
+  Queue(${EXTEN},${ring_instead_of_moh},,,${queuetimeout});
+  Set(queue_waittime=$[${EPOCH}-${queue_entertime}]);
+
+
+
+2. CONFIGURATION
+
+- open the file inc/CallerID/CallerID.class.php
+- find the line that reads:
+
+  protected static $dataProvider = 'CSVLookup,CountryCodes';
+
+- set your preferred order of lookup (from left to right, separated by commas)
+- the first match will be used
+- ignore the $countrycode and $areacode as they will be overwritten by your
+  Gemeinschaft canonization settings (make sure they are correct!)
+
+- Available dataProviders:
+
+  CSVLookup
+  - the csv-file for CSVLookup is inc/CallerID/CSVLookup/telefonbuch.csv
+  - the numbers need to be formatted as your phone shows them (i.e. not in international format!)
+
+  CountryCodes
+  - uses several official prefix lists to return country and sometimes the region of the caller
+  - always returns a match, so dataProviders after this one will not be triggered
+
+  OnlineLookup
+  - looks up the incoming number at different online directories
+  - the definitions are in the file inc/CallerID/OnlineLookup/jfritz-definitions.xml
+  - the XML file should be compatible to the JFritz version (http://jfritz.org/)
diff --git a/dialplan-scripts/in-get-callerid.agi b/dialplan-scripts/in-get-callerid.agi
new file mode 100755
index 0000000..43cca59
--- /dev/null
+++ b/dialplan-scripts/in-get-callerid.agi
@@ -0,0 +1,27 @@
+#!/usr/bin/php -q
+<?php
+
+define( 'GS_VALID', true );  /// this is a parent file
+require_once( dirName(__FILE__) .'/../inc/conf.php' );
+require_once( GS_DIR .'inc/agi-fns.php' );
+
+ini_set('implicit_flush', 1);
+ob_implicit_flush(1);
+
+$number = trim(@$argv[1]);
+if (empty($number)) die();
+
+gs_agi_verbose( '### Number identification for ' . $number );
+
+require_once( GS_DIR . 'inc/CallerID/CallerID.class.php' );
+CallerID::$countrycode = gs_get_conf('GS_CANONIZE_COUNTRY_CODE', '49');
+CallerID::$areacode    = gs_get_conf('GS_CANONIZE_AREA_CODE', '30');
+
+$info = CallerID::getCallerId($number);
+gs_agi_verbose( '### Number ID result: ' . $info );
+
+if ($info !== false) {
+    echo 'SET VARIABLE CALLERID(name) ' . gs_agi_str_esc($info) . "\n";
+}
+
+?>
\ No newline at end of file
diff --git a/dialplan-scripts/in-get-callerid1.agi b/dialplan-scripts/in-get-callerid1.agi
deleted file mode 100755
index ba1d4c2..0000000
--- a/dialplan-scripts/in-get-callerid1.agi
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/php -q
-<?php
-
-define( 'GS_VALID', true );  /// this is a parent file
-require_once( dirName(__FILE__) .'/../inc/conf.php' );
-require_once( GS_DIR .'inc/agi-fns.php' );
-
-ini_set('implicit_flush', 1);
-ob_implicit_flush(1);
-
-$number = trim(@$argv[1]);
-if (empty($number)) die();
-
-gs_agi_verbose( '### Number identification for ' . $number );
-
-require_once( GS_DIR . 'inc/CountryCodes/CountryCodes.class.php' );
-
-$intlnum = $number;
-if (substr($intlnum, 0, 2) == '00') {
-    // int'l number
-    $intlnum = '+' . substr($intlnum, 2);
-} elseif ($number{0} == '0') {
-    // local number
-    $intlnum = '+' . GS_CANONIZE_COUNTRY_CODE . substr($intlnum, 1);
-} else {
-    // plain number
-    $intlnum = '+' . GS_CANONIZE_COUNTRY_CODE . GS_CANONIZE_AREA_CODE . $intlnum;
-}
-gs_agi_verbose( '### Number identification for ' . $intlnum );
-
-$country = CountryCodes::lookupNum($intlnum);
-// will set:
-// $country['Calling Code'] = matched part of number, e.g. "+4930"
-// $country['Country']      = country               , e.g. "Deutschland"
-// $country['CC']           = ISO 2-letter country code, e.g. "DE"
-// $country['District']     = district of country   , e.g. "Berlin"
-// $country['flag']         = <unused>
-
-// file_put_contents('/tmp/countrylookup.txt', print_r($country, true) );
-
-echo 'SET VARIABLE CALLERID(name) ' . gs_agi_str_esc($country['CC'] . ', ' . $country['District']) . "\n";
-
-?>
\ No newline at end of file
diff --git a/dialplan-scripts/in-get-callerid2.agi b/dialplan-scripts/in-get-callerid2.agi
deleted file mode 100755
index e686128..0000000
--- a/dialplan-scripts/in-get-callerid2.agi
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/php -q
-<?php
-
-define( 'GS_VALID', true );  /// this is a parent file
-require_once( dirName(__FILE__) .'/../inc/conf.php' );
-require_once( GS_DIR .'inc/agi-fns.php' );
-
-ini_set('implicit_flush', 1);
-ob_implicit_flush(1);
-
-$number = trim(@$argv[1]);
-if (empty($number)) die();
-
-gs_agi_verbose( '### Number identification for ' . $number );
-
-$intlnum = $number;
-if (substr($intlnum, 0, 2) == '00') {
-    // int'l number
-    $intlnum = '+' . substr($intlnum, 2);
-} elseif ($number{0} == '0') {
-    // local number
-    $intlnum = '+' . GS_CANONIZE_COUNTRY_CODE . substr($intlnum, 1);
-} else {
-    // plain number
-    $intlnum = '+' . GS_CANONIZE_COUNTRY_CODE . GS_CANONIZE_AREA_CODE . $intlnum;
-}
-gs_agi_verbose( '### Canonized number is ' . $intlnum );
-
-$config_file = GS_DIR . 'etc/jf-reverse-lookup.xml';
-$xml = new DOMDocument();
-if (!file_exists($config_file)) echo 'No config!';
-$xml->load($config_file);
-
-$countries =& $xml->getElementsByTagName('country');   // first country entry
-
-for ($i=0; $i<$countries->length; $i++) {
-    $country =& $countries->item($i);
-    $cc = $country->attributes->getNamedItem('code')->nodeValue;
-    if ( $cc == substr($intlnum, 0, strlen($cc)) ) break;
-}
-
-$websites =& $country->getElementsByTagName('website');
-
-for ($i=0; $i<$websites->length; $i++) {
-    $website =& $websites->item($i);
-
-    $wname = $website->attributes->getNamedItem('name')->nodeValue;
-    $wurl  = $website->attributes->getNamedItem('url')->nodeValue;
-    $wpref = $website->attributes->getNamedItem('prefix')->nodeValue;
-    $wentry = $website->getElementsByTagName('entry')->item(0);
-
-    $checknum = $wpref . substr($intlnum, strlen($cc));   // replace int'l prefix by local prefix
-    
-    gs_agi_verbose('Searching ' . $wname . ' (' . ($i+1) . '/' . $websites->length . ')');
-
-    $url = str_replace('$NUMBER', $checknum, $wurl);
-
-    // Had to use wget b/c PHP's file_get_contents() and other tricks didn't succeed (returned wrong data!)
-    exec('wget -q -O - "' . $url . '"', $data);
-    $data = implode("\n", $data);
-
-    gs_agi_verbose('-> got ' . strlen($data) . ' Bytes');
-
-    $lastPos = 0;
-    $details = array();
-    foreach ($wentry->childNodes as $child) {
-        if ($child->nodeType == XML_TEXT_NODE) continue;
-        $ntitle = $child->nodeName;
-        $pattern = $child->nodeValue;
-
-        $matchct = preg_match('/'.$pattern.'/', $data, &$matches, PREG_OFFSET_CAPTURE, $lastPos);
-        if ($matchct == 0) {
-            gs_agi_verbose('NO MATCH FOUND!');
-            break;
-        }
-
-        $details[$ntitle] = rawurldecode($matches[1][0]);
-        $lastPos = $matches[0][1];
-    }
-
-    if (count($details) > 0) break;
-}
-
-// print_r($details);
-if (isset($details['name']) && !empty($details['name'])) {
-    echo 'SET VARIABLE CALLERID(name) ' . gs_agi_str_esc($details['name']) . "\n";
-}
-
-?>
\ No newline at end of file
diff --git a/etc/asterisk/e-internal.ael-add b/etc/asterisk/e-internal.ael-add
index 44720e4..16a8e0e 100644
--- a/etc/asterisk/e-internal.ael-add
+++ b/etc/asterisk/e-internal.ael-add
@@ -1,5 +1,2 @@
-// add this line: (country/city lookup)
-AGI(/opt/gemeinschaft/dialplan-scripts/in-get-callerid1.agi,${CALLERID(num)});
-
-// or this line: (online service lookup)
-AGI(/opt/gemeinschaft/dialplan-scripts/in-get-callerid2.agi,${CALLERID(num)});
+// add this line:
+AGI(/opt/gemeinschaft/dialplan-scripts/in-get-callerid.agi,${CALLERID(num)});
diff --git a/inc/CountryCodes/CSV.class.php b/inc/CallerID/CSVLookup/CSV.class.php
similarity index 95%
rename from inc/CountryCodes/CSV.class.php
rename to inc/CallerID/CSVLookup/CSV.class.php
index 4cb34a5..e416146 100644
--- a/inc/CountryCodes/CSV.class.php
+++ b/inc/CallerID/CSVLookup/CSV.class.php
@@ -6,6 +6,7 @@
  * @author Markus Birth, mbirth@webwriters.de
 **/
 
+if (class_exists('CSV')) return;
 ini_set('auto_detect_line_endings', '1');
 
 class CSV {
@@ -28,7 +29,7 @@ class CSV {
     protected $num_allowed = '0123456789.';
 
     private static $lfw_staleAge = 5;  // staleAge in seconds for locked filewrite
-    private static $lfw_timeLimit = 300000; // time limit in µs to try to gain lock
+    private static $lfw_timeLimit = 300000; // time limit in �s to try to gain lock
 
     function __construct() {
     }
@@ -148,8 +149,8 @@ class CSV {
             foreach ($this->data as $i=>$d) {
                 if (count($d)>$maxct) {
                     $maxct = count($d);
-                    $maxrec = $i;
-                }
+                    $maxrec = $i;
+                }
             }
             $heads = array();
             foreach ($this->data[$maxrec] as $h=>$f) {
@@ -158,7 +159,7 @@ class CSV {
             foreach ($this->data as $i=>$r) {
                 $r2 = array();
                 foreach ($heads as $h) {
-                    $r2[] = $r[$h];
+                    $r2[] = $r[$h];
                 }
                 $this->data[$i] = $r2;
             }
@@ -263,9 +264,9 @@ class CSV {
         if (is_string($keycol)) {
             if ($this->useheaders === false) {
                 $keycol = array_search($keycol, $this->data[0]);
-                if (!$keycol) return false;
+                if (!$keycol) return false;
             }
-
+
         }
         $sortme = array();
         foreach ($this->data as $i=>$d) {
diff --git a/inc/CallerID/CSVLookup/ResolverBridge.php b/inc/CallerID/CSVLookup/ResolverBridge.php
new file mode 100644
index 0000000..718c16d
--- /dev/null
+++ b/inc/CallerID/CSVLookup/ResolverBridge.php
@@ -0,0 +1,44 @@
+<?php
+
+require_once(dirname(__FILE__) . '/../CallerIDResolver.interface.php');
+require_once(dirname(__FILE__) . '/CSV.class.php');
+
+class CallerID_CSVLookup implements CallerIDResolver {
+    const CSV_FILE = 'telefonbuch.csv';
+
+    protected static function localizeNumber($number) {
+        // convert +XX to 00XX or omit if local
+        if ($number{0} == '+') {
+            if (substr($number, 1, strlen(CallerID::$countrycode)) == CallerID::$countrycode) {
+                $number = '0' . substr($number, 1+strlen(CallerID::$countrycode));
+            } else {
+                $number = '00' . substr($number, 1);
+            }
+        }
+        return $number;
+    }
+
+    public static function lookupNum($number) {
+        $csv = new CSV();
+        $csv->setDelimiter(';');
+        $csv->load(dirname(__FILE__) . '/' . self::CSV_FILE, true);
+
+        $data = $csv->getTable();
+
+        $csv->close();
+
+        $number = self::localizeNumber($number);
+
+        foreach ($data as $entry) {
+            // CSV format: Name;Number
+            if ($entry[1] == $number) {
+                return $entry[0];
+            }
+        }
+
+        return false;
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/inc/CallerID/CSVLookup/telefonbuch.csv b/inc/CallerID/CSVLookup/telefonbuch.csv
new file mode 100644
index 0000000..a60c919
--- /dev/null
+++ b/inc/CallerID/CSVLookup/telefonbuch.csv
@@ -0,0 +1 @@
+Mustermann, Max;03012345678
diff --git a/inc/CallerID/CallerID.class.php b/inc/CallerID/CallerID.class.php
new file mode 100644
index 0000000..6bd6400
--- /dev/null
+++ b/inc/CallerID/CallerID.class.php
@@ -0,0 +1,41 @@
+<?php
+
+class CallerID {
+    // could easily check folders automatically to find dataProviders
+    protected static $dataProvider = 'CSVLookup,CountryCodes';
+    public static $countrycode = '49';
+    public static $areacode    = '30';
+
+    protected static function canonizeNumber($number) {
+        if ($number{0} == '+') return $number;  // already canonized
+        if (substr($number, 0, 2) == '00') {
+            // int'l number
+            $number = '+' . substr($number, 2);
+        } elseif ($number{0} == '0') {
+            // local number
+            $number = '+' . self::$countrycode . substr($number, 1);
+        } else {
+            // plain number
+            $number = '+' . self::$countrycode . self::$areacode . $number;
+        }
+        return $number;
+    }
+
+    public static function getCallerId($number) {
+        $number = self::canonizeNumber($number);
+        $provider = explode(',', self::$dataProvider);
+
+        foreach ($provider as $p) {
+            include_once(dirname(__FILE__) . '/' . $p . '/ResolverBridge.php');
+            $classname = __CLASS__ . '_' . $p;
+            if (!class_exists($classname)) continue;
+
+            $info = call_user_func(array($classname, 'lookupNum'), $number);
+            if ($info !== false) return $info;
+        }
+
+        return false;
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/inc/CallerID/CallerIDResolver.interface.php b/inc/CallerID/CallerIDResolver.interface.php
new file mode 100644
index 0000000..4a28561
--- /dev/null
+++ b/inc/CallerID/CallerIDResolver.interface.php
@@ -0,0 +1,9 @@
+<?php
+
+interface CallerIDResolver {
+    public static function lookupNum($number);
+
+}
+
+
+?>
\ No newline at end of file
diff --git a/inc/CountryCodes/+1.php b/inc/CallerID/CountryCodes/+1.php
similarity index 100%
rename from inc/CountryCodes/+1.php
rename to inc/CallerID/CountryCodes/+1.php
diff --git a/inc/CountryCodes/+1/NpasInSvcByNumRpt.csv b/inc/CallerID/CountryCodes/+1/NpasInSvcByNumRpt.csv
similarity index 100%
rename from inc/CountryCodes/+1/NpasInSvcByNumRpt.csv
rename to inc/CallerID/CountryCodes/+1/NpasInSvcByNumRpt.csv
diff --git a/inc/CountryCodes/+1/NpasInSvcByNumRpt.url b/inc/CallerID/CountryCodes/+1/NpasInSvcByNumRpt.url
similarity index 100%
rename from inc/CountryCodes/+1/NpasInSvcByNumRpt.url
rename to inc/CallerID/CountryCodes/+1/NpasInSvcByNumRpt.url
diff --git a/inc/CountryCodes/+264.csv b/inc/CallerID/CountryCodes/+264.csv
similarity index 100%
rename from inc/CountryCodes/+264.csv
rename to inc/CallerID/CountryCodes/+264.csv
diff --git a/inc/CountryCodes/+33.csv b/inc/CallerID/CountryCodes/+33.csv
similarity index 64%
rename from inc/CountryCodes/+33.csv
rename to inc/CallerID/CountryCodes/+33.csv
index c6ffea5..01baf62 100644
--- a/inc/CountryCodes/+33.csv
+++ b/inc/CallerID/CountryCodes/+33.csv
@@ -1,4 +1,4 @@
-"Calling Code";"District"
+"Calling Code";"District";"CC";"Country"
 1;"Paris"
 2;"NW-Frankreich"
 3;"NO-Frankreich"
@@ -6,4 +6,4 @@
 5;"SW-Frankreich"
 6;"Mobilfunk"
 8;"Freephone"
-9;"ortsunabhängig"
+9;"ortsunabhängig"
\ No newline at end of file
diff --git a/inc/CountryCodes/+385.csv b/inc/CallerID/CountryCodes/+385.csv
similarity index 100%
rename from inc/CountryCodes/+385.csv
rename to inc/CallerID/CountryCodes/+385.csv
diff --git a/inc/CountryCodes/+49.php b/inc/CallerID/CountryCodes/+49.php
similarity index 100%
rename from inc/CountryCodes/+49.php
rename to inc/CallerID/CountryCodes/+49.php
diff --git a/inc/CountryCodes/+49/LosgXXXX.TXT b/inc/CallerID/CountryCodes/+49/LosgXXXX.TXT
similarity index 100%
rename from inc/CountryCodes/+49/LosgXXXX.TXT
rename to inc/CallerID/CountryCodes/+49/LosgXXXX.TXT
diff --git a/inc/CountryCodes/+49/LosgXXXX.url b/inc/CallerID/CountryCodes/+49/LosgXXXX.url
similarity index 100%
rename from inc/CountryCodes/+49/LosgXXXX.url
rename to inc/CallerID/CountryCodes/+49/LosgXXXX.url
diff --git a/inc/CallerID/CountryCodes/CSV.class.php b/inc/CallerID/CountryCodes/CSV.class.php
new file mode 100644
index 0000000..e416146
--- /dev/null
+++ b/inc/CallerID/CountryCodes/CSV.class.php
@@ -0,0 +1,407 @@
+<?php
+
+/**
+ * CSV class for easy use of CSV files as tables
+ *
+ * @author Markus Birth, mbirth@webwriters.de
+**/
+
+if (class_exists('CSV')) return;
+ini_set('auto_detect_line_endings', '1');
+
+class CSV {
+
+    /** CSV formatting variables */
+    protected $csv_delim = ',';
+    protected $csv_stren = '"';
+    protected $csv_decim = '.';
+    protected $csv_escap = '\\';
+
+    /** table-filename, read-only- and headers-flag */
+    protected $file, $readonly;
+    protected $useheaders = false;
+    protected $autoconvert = false;
+
+    /** table contents */
+    protected $data, $headers;
+
+    /** holds allowed characters for numerical values */
+    protected $num_allowed = '0123456789.';
+
+    private static $lfw_staleAge = 5;  // staleAge in seconds for locked filewrite
+    private static $lfw_timeLimit = 300000; // time limit in �s to try to gain lock
+
+    function __construct() {
+    }
+
+    function setDecimal($nd) {
+        if (strlen($nd) != 1) return false;
+        $this->csv_decim = $nd;
+        $this->num_allowed = '0123456789' . $nd;
+        return true;
+    }
+
+    function setStringEnclosure($enc) {
+        if (strlen($enc) != 1) return false;
+        $this->csv_stren = $enc;
+        return true;
+    }
+
+    function setDelimiter($deli) {
+        if (strlen($deli) != 1) return false;
+        $this->csv_delim = $deli;
+        return true;
+    }
+
+    /**
+     * creates a new table; empty or from given array via <code>$init</code>
+     *
+     * @public
+     * @param $table name of new table
+     * @param $init array with initial table (if omitted or not an array, an empty table is created)
+     * @return <code>true</code> if successful; <code>false</code> if failed
+     */
+    function create($file, $init = false) {
+        if (isset($this->file) || isset($this->data)) return false;
+        $this->file = $file;
+        $this->readonly = false;
+        $this->data = array();
+        if ($init !== false) {
+            if (!is_array($init)) $init = array($init);
+            foreach ($init as $tmp) {
+                if (!is_array($tmp)) $tmp = array($tmp);
+                array_push($this->data, $tmp);
+            }
+        } else {
+            $this->data = array();
+        }
+        return true;
+    }
+
+    /**
+     * loads a table from CSV file
+     *
+     * @public
+     * @param $table name of table to load (without '.csv'!)
+     * @param $readonly if true, loads table for read-only (defaults to false)
+     * @param $delim CSV delimiter (defaults to ',')
+     * @param $stren CSV string encloser (defaults to '"')
+     * @param $decim Decimal separator (defaults to '.')
+     * @return <code>true</code> if successful; <code>false</code> if failed
+     */
+    function load($file, $readonly = false) {
+        if (isset($this->file) || isset($this->data) || !file_exists($file)) return false;
+        $this->data = array();
+        $this->file = $file;
+        $this->readonly = $readonly;
+        $f = fopen($this->file, 'rt');
+        if ($f === false) return false;
+        $safety = -1;
+        while (($temp = fgetcsv($f, filesize($this->file), $this->csv_delim, $this->csv_stren)) !== false) {
+            $temp = preg_replace('/\\\([^\\\])/', '\\1', $temp);
+            $temp = str_replace('\\\\', '\\', $temp);
+            $this->data[] = $temp;
+            if (ftell($f) == $safety) break;  // loop
+            $safety = ftell($f);
+        }
+        fclose($f);
+        return true;
+    }
+
+    /**
+     * sets whether to treat all fields as string or as specific types
+     *
+     * @public
+     * @param $acflag new boolean value
+     */
+    function setAutoConvert($acflag) {
+        if (!is_bool($acflag)) return false;
+        $this->autoconvert = $acflag;
+        return true;
+    }
+
+    /**
+     * sets whether to use headers in first data row for description of fields
+     * or use 0..n as field descriptors. Doesn't affect the $this->data object.
+     *
+     * @public
+     * @param $hflag new boolean value
+     */
+    function setUseHeaders($hflag) {
+        if (!is_bool($hflag)) return false;
+        if ($this->useheaders === $hflag) return true;
+        if ($hflag) {
+            // Apply headings from first row to all entries
+            // and remove first row
+            $heads = array_shift($this->data);
+            foreach ($this->data as $i=>$r) {
+                $r2 = array();
+                foreach ($r as $j=>$d) {
+                    $r2[$heads[$j]] = $d;
+                }
+                $this->data[$i] = $r2;
+            }
+        } else {
+            // Extract headings from longest data record
+            // and prepend header line to data array
+            $maxrec = 0;
+            $maxct = 0;
+            foreach ($this->data as $i=>$d) {
+                if (count($d)>$maxct) {
+                    $maxct = count($d);
+                    $maxrec = $i;
+                }
+            }
+            $heads = array();
+            foreach ($this->data[$maxrec] as $h=>$f) {
+                $heads[] = $h;
+            }
+            foreach ($this->data as $i=>$r) {
+                $r2 = array();
+                foreach ($heads as $h) {
+                    $r2[] = $r[$h];
+                }
+                $this->data[$i] = $r2;
+            }
+            array_unshift($this->data, $heads);
+        }
+        $this->useheaders = $hflag;
+        return true;
+    }
+
+    /**
+     * saves currently open table to CSV file
+     * (locked filewrite code from http://de2.php.net/manual/en/function.flock.php#46085)
+     *
+     * @public
+     * @return <code>true</code> if successful; <code>false</code> if failed
+     */
+    function save() {
+        if ($this->readonly === true || !isset($this->file) || !isset($this->data)) return false;
+        $headerstate = $this->useheaders;
+        if ($this->useheaders === true) {
+            // prepend headers if used
+            $this->setUseHeaders(false);
+        }
+
+        // BEGIN: Gain lock
+        ignore_user_abort(true);
+        $lockdir = $this->file . '.lock';
+        if (is_dir($lockdir)) {
+            if ((time() - filemtime($lockdir)) > self::$lfw_staleAge) {
+                rmdir($lockdir);
+            }
+        }
+        $locked = @mkdir($lockdir);
+        if ($locked === false) {
+            $timestart = microtime(true);
+            do {
+                if ((microtime(true) - $timestart) > self::$lfw_timeLimit) {
+                    ignore_user_abort(false);
+                    $this->setUseHeaders($headerstate);
+                    return false;
+                }
+                $locked = @mkdir($lockdir);
+            } while ($locked === false);
+        }
+        // END: Gain lock
+
+        $f = fopen($this->file, 'wt');
+        foreach ($this->data as $line) {
+            if (count($line)>0 && strlen(implode('', $line))>0) {
+                $temp = array();
+                foreach ($line as $tmp) {
+                    if (!is_numeric($tmp) && !is_bool($tmp)) {
+                        if (strlen($this->csv_stren)>0) $tmp = strtr($tmp, array('\\'=>'\\\\', $this->csv_stren=>'\\'.$this->csv_stren));
+                        $temp[] = $this->csv_stren . $tmp . $this->csv_stren;
+                    } elseif (is_numeric($tmp)) {
+                        if (is_float($tmp)) {
+                            $temp[] = strtr((string)$tmp, ".", $this->csv_decim);
+                        } else {
+                            $temp[] = $tmp;
+                        }
+                    } elseif (is_bool($tmp)) {
+                        if ($tmp==true) {
+                            $temp[] = 'true';
+                        } else {
+                            $temp[] = 'false';
+                        }
+                    }
+                }
+                if (!fwrite($f, implode($this->csv_delim, $temp) . "\n")) {
+                    $this->setUseHeaders($headerstate);   // restore previous state
+                    ignore_user_abort(false);
+                    return false;
+                }
+            }
+        }
+        fclose($f);
+        rmdir($lockdir);
+        ignore_user_abort(false);
+        $this->setUseHeaders($headerstate);   // restore previous state
+        return true;
+    }
+
+    /**
+     * closes currently open table
+     *
+     * @public
+     * @param $save if true, writes table to CSV file before close (defaults to true)
+     * @return <code>true</code> if successful; <code>false</code> if failed
+     */
+    function close($save = true) {
+        if (!isset($this->file) || !isset($this->data)) return false;
+        if ($save===true && !$this->readonly) {
+            if (!$this->save()) return false;
+        }
+        unset($this->file);
+        unset($this->readonly);
+        unset($this->data);
+        return true;
+    }
+
+    function sortRows($keycol, $rev = false) {
+        if (is_string($keycol)) {
+            if ($this->useheaders === false) {
+                $keycol = array_search($keycol, $this->data[0]);
+                if (!$keycol) return false;
+            }
+
+        }
+        $sortme = array();
+        foreach ($this->data as $i=>$d) {
+            $sortme[$i] = $d[$keycol];
+        }
+        asort($sortme);
+        $newdata = array();
+        if ($this->useheaders === false) {
+            $newdata[0] = $this->data[0];
+        }
+        foreach ($sortme as $i=>$d) {
+            if ($i==0 && $this->useheaders === false) continue;
+            $newdata[] = $this->data[$i];
+        }
+        if ($rev === true) $newdata = array_reverse($newdata);
+        $this->data = $newdata;
+        return true;
+    }
+
+    function getTable() {
+        if (!isset($this->data)) return false;
+        return $this->data;
+    }
+
+    function setTable($tbl) {
+        if (!is_array($tbl) || !is_array(reset($tbl))) return false;
+        $this->data = $tbl;
+        return true;
+    }
+
+    /**
+     * returns an array with all elements of a complete row
+     *
+     * @public
+     * @param $rid id of the row
+     * @return array with elements if successful; <code>false</code> if failed
+     */
+    function getRow($rid) {
+        if (!isset($this->data[$rid])) return false;
+        if (!$this->autoconvert) return $this->data[$rid];
+
+        $result = array();
+        foreach ($this->data[$rid] as $i=>$d) {
+            $result[$i] = $this->guessType($d);
+        }
+        return $result;
+    }
+
+    /**
+     * returns a single cell value
+     *
+     * @public
+     * @param $rid id of the row
+     * @param $cid id of the column
+     * @return cell contents if successful; <code>false</code> if failed
+     */
+    function getRowCol($rid, $cid) {
+        if (!isset($this->data[$rid][$cid])) return false;
+        if (!$this->autoconvert) return $this->data[$rid][$cid];
+
+        return $this->guessType($this->data[$rid][$cid]);
+    }
+
+    /**
+     * Guesses type of a value by its content
+     *
+     * @public
+     * @param $val String to guess type
+     * @return String, (int) or (float)
+     */
+    function guessType($val) {
+        $commas = 0;
+        for ($i=0;$i<strlen($val);$i++) {
+            $c = $val{$i};
+            if (strpos($this->num_allowed, $c) === false) return $val;
+            if ($c == $this->csv_decim) $commas++;
+        }
+        $val = strtr($val, $this->csv_decim, '.');
+        if ($commas>1) return $val;
+        if ($commas==1) return floatval($val);
+        return intval($val);
+    }
+
+    /**
+     * Guesses type for the whole database
+     *
+     * @public
+     */
+    function guessTypeAll() {
+        foreach ($this->data as $i=>$r) {
+            foreach ($r as $j=>$d) {
+                $this->data[$i][$j] = $this->guessType($d);
+            }
+        }
+    }
+
+    /**
+     * writes a value to a single cell
+     *
+     * @public
+     * @param $rid id of the row
+     * @param $cid id of the column
+     * @param $val new value to write to cell
+     * @return <code>true</code> if successful; <code>false</code> if failed
+     */
+    function setRowCol($rid, $cid, $val) {
+        $this->data[$rid][$cid] = $val;
+    }
+
+    /**
+     * writes an array to a row
+     *
+     * @public
+     * @param $rid id of the row
+     * @param $line array with column contents to write to line
+     * @return <code>true</code> if successful; <code>false</code> if failed
+     */
+    function setRow($rid, $line) {
+        if (!is_array($line)) return false;
+        $this->data[$rid] = $line;
+        return true;
+    }
+
+    /**
+     * deletes a row
+     *
+     * @public
+     * @param $rid id of the row
+     * @return <code>true</code> if successful; <code>false</code> if failed
+     */
+    function delRow($rid) {
+        if (!isset($this->data[$rid])) return false;
+        unset($this->data[$rid]);
+        return true;
+    }
+}
+
+?>
diff --git a/inc/CountryCodes/CountryCodes.class.php b/inc/CallerID/CountryCodes/CountryCodes.class.php
similarity index 91%
rename from inc/CountryCodes/CountryCodes.class.php
rename to inc/CallerID/CountryCodes/CountryCodes.class.php
index 618970c..7c5991d 100644
--- a/inc/CountryCodes/CountryCodes.class.php
+++ b/inc/CallerID/CountryCodes/CountryCodes.class.php
@@ -81,4 +81,13 @@ class CountryCodes {
     }
 }
 
+if (isset($argc)) {
+    echo 'TEST MODE' . PHP_EOL;
+    do {
+        echo 'Enter number, e.g. +4930123456 (0 = exit): ';
+        $inp = trim(fgets(STDIN));
+        print_r(CountryCodes::lookupNum($inp));
+    } while ($inp != '0');
+}
+
 ?>
\ No newline at end of file
diff --git a/inc/CallerID/CountryCodes/ResolverBridge.php b/inc/CallerID/CountryCodes/ResolverBridge.php
new file mode 100644
index 0000000..bc546d2
--- /dev/null
+++ b/inc/CallerID/CountryCodes/ResolverBridge.php
@@ -0,0 +1,29 @@
+<?php
+
+require_once(dirname(__FILE__) . '/../CallerIDResolver.interface.php');
+require_once(dirname(__FILE__) . '/CountryCodes.class.php');
+
+class CallerID_CountryCodes implements CallerIDResolver {
+
+    public static function lookupNum($number) {
+        $info = CountryCodes::lookupNum($number);
+
+        /*
+         * $info = array(
+         *   'Calling Code' => '+493322',
+         *   'Country'      => 'Deutschland',
+         *   'CC'           => 'DE',
+         *   'District'     => 'Falkensee',
+         *   'flag'         => '',
+         * );
+         */
+
+         $result = $info['CC'];
+         if (!empty($info['District'])) $result .= ', ' . $info['District'];
+
+        return $result;
+    }
+    
+}
+
+?>
\ No newline at end of file
diff --git a/inc/CountryCodes/countries.csv b/inc/CallerID/CountryCodes/countries.csv
similarity index 100%
rename from inc/CountryCodes/countries.csv
rename to inc/CallerID/CountryCodes/countries.csv
diff --git a/inc/CallerID/OnlineLookup/OnlineLookup.class.php b/inc/CallerID/OnlineLookup/OnlineLookup.class.php
new file mode 100644
index 0000000..d559405
--- /dev/null
+++ b/inc/CallerID/OnlineLookup/OnlineLookup.class.php
@@ -0,0 +1,92 @@
+<?php
+
+class OnlineLookup {
+    public static $xml = 'jfritz-definitions.xml';
+    public static $countrycode = '49';
+    public static $areacode    = '30';
+
+    protected static function canonizeNumber($number) {
+        if ($number{0} == '+') return $number;  // already canonized
+        if (substr($number, 0, 2) == '00') {
+            // int'l number
+            $number = '+' . substr($number, 2);
+        } elseif ($number{0} == '0') {
+            // local number
+            $number = '+' . self::$countrycode . substr($number, 1);
+        } else {
+            // plain number
+            $number = '+' . self::$countrycode . self::$areacode . $number;
+        }
+        return $number;
+    }
+
+    protected static function getDefinitionsForCountry($number) {
+        $configfile = dirname(__FILE__) . '/' . self::$xml;
+        $xml = new DOMDocument();
+        if (!file_exists($configfile)) return false;
+        $xml->load($configfile);
+        
+        $countries =& $xml->getElementsByTagName('country');   // first country entry
+
+        for ($i=0; $i<$countries->length; $i++) {
+            $country =& $countries->item($i);
+            $cc = $country->attributes->getNamedItem('code')->nodeValue;
+            if ( $cc == substr($number, 0, strlen($cc)) ) return $country;
+        }
+        return false;
+    }
+
+    public static function getNumberInfo($number, $maxhosts = 99) {
+        $number  = self::canonizeNumber($number);
+        $country = self::getDefinitionsForCountry($number);
+        if ($country === false) return false;
+
+        $cc = $country->attributes->getNamedItem('code')->nodeValue;
+
+        $websites =& $country->getElementsByTagName('website');
+
+        for ($i=0; $i<$websites->length; $i++) {
+            $website =& $websites->item($i);
+
+            $wname = $website->attributes->getNamedItem('name')->nodeValue;
+            $wurl  = $website->attributes->getNamedItem('url')->nodeValue;
+            $wpref = $website->attributes->getNamedItem('prefix')->nodeValue;
+            $wentry = $website->getElementsByTagName('entry')->item(0);
+
+            $checknum = $wpref . substr($number, strlen($cc));   // replace int'l prefix by local prefix
+
+            $url = str_replace('$NUMBER', $checknum, $wurl);
+
+            // Had to use wget b/c PHP's file_get_contents() and other tricks didn't succeed (returned wrong data!)
+            exec('wget -q -O - "' . $url . '"', $data);
+            $data = implode("\n", $data);
+
+            $lastPos = 0;
+            $details = array();
+            foreach ($wentry->childNodes as $child) {
+                if ($child->nodeType == XML_TEXT_NODE) continue;
+                $ntitle = $child->nodeName;
+                $pattern = $child->nodeValue;
+                $pattern = str_replace('/', '\\/', $pattern);
+
+                $matchct = preg_match('/'.$pattern.'/', $data, &$matches, PREG_OFFSET_CAPTURE, $lastPos);
+                if ($matchct == 0) {
+                    break;
+                }
+
+                $details[$ntitle] = html_entity_decode( rawurldecode( trim($matches[1][0]) ) );
+                $lastPos = $matches[0][1];
+            }
+
+            if (count($details) > 0 || --$maxhosts <= 0) break;
+        }
+
+        // print_r($details);
+        if (isset($details['name']) && !empty($details['name'])) {
+            return  $details;
+        }
+        return false;
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/inc/CallerID/OnlineLookup/ResolverBridge.php b/inc/CallerID/OnlineLookup/ResolverBridge.php
new file mode 100644
index 0000000..457211b
--- /dev/null
+++ b/inc/CallerID/OnlineLookup/ResolverBridge.php
@@ -0,0 +1,18 @@
+<?php
+
+require_once(dirname(__FILE__) . '/../CallerIDResolver.interface.php');
+require_once(dirname(__FILE__) . '/OnlineLookup.class.php');
+
+class CallerID_OnlineLookup implements CallerIDResolver {
+
+    public static function lookupNum($number) {
+        OnlineLookup::$countrycode = CallerID::$countrycode;
+        OnlineLookup::$areacode    = CallerID::$areacode;
+
+        $info = OnlineLookup::getNumberInfo($number);
+        if ($info === false) return false;
+        return $info['name'];
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/etc/jf-reverse-lookup.xml b/inc/CallerID/OnlineLookup/jfritz-definitions.xml
similarity index 100%
rename from etc/jf-reverse-lookup.xml
rename to inc/CallerID/OnlineLookup/jfritz-definitions.xml
diff --git a/inc/CountryCodes/flags/ad.png b/inc/CountryCodes/flags/ad.png
deleted file mode 100644
index 625ca84..0000000
Binary files a/inc/CountryCodes/flags/ad.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ae.png b/inc/CountryCodes/flags/ae.png
deleted file mode 100644
index ef3a1ec..0000000
Binary files a/inc/CountryCodes/flags/ae.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/af.png b/inc/CountryCodes/flags/af.png
deleted file mode 100644
index a4742e2..0000000
Binary files a/inc/CountryCodes/flags/af.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ag.png b/inc/CountryCodes/flags/ag.png
deleted file mode 100644
index 556d550..0000000
Binary files a/inc/CountryCodes/flags/ag.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ai.png b/inc/CountryCodes/flags/ai.png
deleted file mode 100644
index 74ed29d..0000000
Binary files a/inc/CountryCodes/flags/ai.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/al.png b/inc/CountryCodes/flags/al.png
deleted file mode 100644
index 92354cb..0000000
Binary files a/inc/CountryCodes/flags/al.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/am.png b/inc/CountryCodes/flags/am.png
deleted file mode 100644
index 344a2a8..0000000
Binary files a/inc/CountryCodes/flags/am.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/an.png b/inc/CountryCodes/flags/an.png
deleted file mode 100644
index 633e4b8..0000000
Binary files a/inc/CountryCodes/flags/an.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ao.png b/inc/CountryCodes/flags/ao.png
deleted file mode 100644
index bcbd1d6..0000000
Binary files a/inc/CountryCodes/flags/ao.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ar.png b/inc/CountryCodes/flags/ar.png
deleted file mode 100644
index e5ef8f1..0000000
Binary files a/inc/CountryCodes/flags/ar.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/as.png b/inc/CountryCodes/flags/as.png
deleted file mode 100644
index 32f30e4..0000000
Binary files a/inc/CountryCodes/flags/as.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/at.png b/inc/CountryCodes/flags/at.png
deleted file mode 100644
index 0f15f34..0000000
Binary files a/inc/CountryCodes/flags/at.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/au.png b/inc/CountryCodes/flags/au.png
deleted file mode 100644
index a01389a..0000000
Binary files a/inc/CountryCodes/flags/au.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/aw.png b/inc/CountryCodes/flags/aw.png
deleted file mode 100644
index a3579c2..0000000
Binary files a/inc/CountryCodes/flags/aw.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ax.png b/inc/CountryCodes/flags/ax.png
deleted file mode 100644
index 1eea80a..0000000
Binary files a/inc/CountryCodes/flags/ax.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/az.png b/inc/CountryCodes/flags/az.png
deleted file mode 100644
index 4ee9fe5..0000000
Binary files a/inc/CountryCodes/flags/az.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ba.png b/inc/CountryCodes/flags/ba.png
deleted file mode 100644
index c774992..0000000
Binary files a/inc/CountryCodes/flags/ba.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bb.png b/inc/CountryCodes/flags/bb.png
deleted file mode 100644
index 0df19c7..0000000
Binary files a/inc/CountryCodes/flags/bb.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bd.png b/inc/CountryCodes/flags/bd.png
deleted file mode 100644
index 076a8bf..0000000
Binary files a/inc/CountryCodes/flags/bd.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/be.png b/inc/CountryCodes/flags/be.png
deleted file mode 100644
index d86ebc8..0000000
Binary files a/inc/CountryCodes/flags/be.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bf.png b/inc/CountryCodes/flags/bf.png
deleted file mode 100644
index ab5ce8f..0000000
Binary files a/inc/CountryCodes/flags/bf.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bg.png b/inc/CountryCodes/flags/bg.png
deleted file mode 100644
index 0469f06..0000000
Binary files a/inc/CountryCodes/flags/bg.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bh.png b/inc/CountryCodes/flags/bh.png
deleted file mode 100644
index ea8ce68..0000000
Binary files a/inc/CountryCodes/flags/bh.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bi.png b/inc/CountryCodes/flags/bi.png
deleted file mode 100644
index 5cc2e30..0000000
Binary files a/inc/CountryCodes/flags/bi.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bj.png b/inc/CountryCodes/flags/bj.png
deleted file mode 100644
index 1cc8b45..0000000
Binary files a/inc/CountryCodes/flags/bj.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bm.png b/inc/CountryCodes/flags/bm.png
deleted file mode 100644
index c0c7aea..0000000
Binary files a/inc/CountryCodes/flags/bm.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bn.png b/inc/CountryCodes/flags/bn.png
deleted file mode 100644
index 8fb0984..0000000
Binary files a/inc/CountryCodes/flags/bn.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bo.png b/inc/CountryCodes/flags/bo.png
deleted file mode 100644
index ce7ba52..0000000
Binary files a/inc/CountryCodes/flags/bo.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/br.png b/inc/CountryCodes/flags/br.png
deleted file mode 100644
index 9b1a553..0000000
Binary files a/inc/CountryCodes/flags/br.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bs.png b/inc/CountryCodes/flags/bs.png
deleted file mode 100644
index 639fa6c..0000000
Binary files a/inc/CountryCodes/flags/bs.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bt.png b/inc/CountryCodes/flags/bt.png
deleted file mode 100644
index 1d512df..0000000
Binary files a/inc/CountryCodes/flags/bt.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bv.png b/inc/CountryCodes/flags/bv.png
deleted file mode 100644
index 160b6b5..0000000
Binary files a/inc/CountryCodes/flags/bv.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bw.png b/inc/CountryCodes/flags/bw.png
deleted file mode 100644
index fcb1039..0000000
Binary files a/inc/CountryCodes/flags/bw.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/by.png b/inc/CountryCodes/flags/by.png
deleted file mode 100644
index 504774e..0000000
Binary files a/inc/CountryCodes/flags/by.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/bz.png b/inc/CountryCodes/flags/bz.png
deleted file mode 100644
index be63ee1..0000000
Binary files a/inc/CountryCodes/flags/bz.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ca.png b/inc/CountryCodes/flags/ca.png
deleted file mode 100644
index 1f20419..0000000
Binary files a/inc/CountryCodes/flags/ca.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/catalonia.png b/inc/CountryCodes/flags/catalonia.png
deleted file mode 100644
index 5041e30..0000000
Binary files a/inc/CountryCodes/flags/catalonia.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cc.png b/inc/CountryCodes/flags/cc.png
deleted file mode 100644
index aed3d3b..0000000
Binary files a/inc/CountryCodes/flags/cc.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cd.png b/inc/CountryCodes/flags/cd.png
deleted file mode 100644
index 5e48942..0000000
Binary files a/inc/CountryCodes/flags/cd.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cf.png b/inc/CountryCodes/flags/cf.png
deleted file mode 100644
index da687bd..0000000
Binary files a/inc/CountryCodes/flags/cf.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cg.png b/inc/CountryCodes/flags/cg.png
deleted file mode 100644
index a859792..0000000
Binary files a/inc/CountryCodes/flags/cg.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ch.png b/inc/CountryCodes/flags/ch.png
deleted file mode 100644
index 242ec01..0000000
Binary files a/inc/CountryCodes/flags/ch.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ci.png b/inc/CountryCodes/flags/ci.png
deleted file mode 100644
index 3f2c62e..0000000
Binary files a/inc/CountryCodes/flags/ci.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ck.png b/inc/CountryCodes/flags/ck.png
deleted file mode 100644
index 746d3d6..0000000
Binary files a/inc/CountryCodes/flags/ck.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cl.png b/inc/CountryCodes/flags/cl.png
deleted file mode 100644
index 29c6d61..0000000
Binary files a/inc/CountryCodes/flags/cl.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cm.png b/inc/CountryCodes/flags/cm.png
deleted file mode 100644
index f65c5bd..0000000
Binary files a/inc/CountryCodes/flags/cm.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cn.png b/inc/CountryCodes/flags/cn.png
deleted file mode 100644
index 8914414..0000000
Binary files a/inc/CountryCodes/flags/cn.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/co.png b/inc/CountryCodes/flags/co.png
deleted file mode 100644
index a118ff4..0000000
Binary files a/inc/CountryCodes/flags/co.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cr.png b/inc/CountryCodes/flags/cr.png
deleted file mode 100644
index c7a3731..0000000
Binary files a/inc/CountryCodes/flags/cr.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cs.png b/inc/CountryCodes/flags/cs.png
deleted file mode 100644
index 8254790..0000000
Binary files a/inc/CountryCodes/flags/cs.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cu.png b/inc/CountryCodes/flags/cu.png
deleted file mode 100644
index 083f1d6..0000000
Binary files a/inc/CountryCodes/flags/cu.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cv.png b/inc/CountryCodes/flags/cv.png
deleted file mode 100644
index a63f7ea..0000000
Binary files a/inc/CountryCodes/flags/cv.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cx.png b/inc/CountryCodes/flags/cx.png
deleted file mode 100644
index 48e31ad..0000000
Binary files a/inc/CountryCodes/flags/cx.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cy.png b/inc/CountryCodes/flags/cy.png
deleted file mode 100644
index 5b1ad6c..0000000
Binary files a/inc/CountryCodes/flags/cy.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/cz.png b/inc/CountryCodes/flags/cz.png
deleted file mode 100644
index c8403dd..0000000
Binary files a/inc/CountryCodes/flags/cz.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/de.png b/inc/CountryCodes/flags/de.png
deleted file mode 100644
index ac4a977..0000000
Binary files a/inc/CountryCodes/flags/de.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/dj.png b/inc/CountryCodes/flags/dj.png
deleted file mode 100644
index 582af36..0000000
Binary files a/inc/CountryCodes/flags/dj.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/dk.png b/inc/CountryCodes/flags/dk.png
deleted file mode 100644
index e2993d3..0000000
Binary files a/inc/CountryCodes/flags/dk.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/dm.png b/inc/CountryCodes/flags/dm.png
deleted file mode 100644
index 5fbffcb..0000000
Binary files a/inc/CountryCodes/flags/dm.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/do.png b/inc/CountryCodes/flags/do.png
deleted file mode 100644
index 5a04932..0000000
Binary files a/inc/CountryCodes/flags/do.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/dz.png b/inc/CountryCodes/flags/dz.png
deleted file mode 100644
index 335c239..0000000
Binary files a/inc/CountryCodes/flags/dz.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ec.png b/inc/CountryCodes/flags/ec.png
deleted file mode 100644
index 0caa0b1..0000000
Binary files a/inc/CountryCodes/flags/ec.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ee.png b/inc/CountryCodes/flags/ee.png
deleted file mode 100644
index 0c82efb..0000000
Binary files a/inc/CountryCodes/flags/ee.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/eg.png b/inc/CountryCodes/flags/eg.png
deleted file mode 100644
index 8a3f7a1..0000000
Binary files a/inc/CountryCodes/flags/eg.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/eh.png b/inc/CountryCodes/flags/eh.png
deleted file mode 100644
index 90a1195..0000000
Binary files a/inc/CountryCodes/flags/eh.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/england.png b/inc/CountryCodes/flags/england.png
deleted file mode 100644
index 3a7311d..0000000
Binary files a/inc/CountryCodes/flags/england.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/er.png b/inc/CountryCodes/flags/er.png
deleted file mode 100644
index 13065ae..0000000
Binary files a/inc/CountryCodes/flags/er.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/es.png b/inc/CountryCodes/flags/es.png
deleted file mode 100644
index c2de2d7..0000000
Binary files a/inc/CountryCodes/flags/es.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/et.png b/inc/CountryCodes/flags/et.png
deleted file mode 100644
index 2e893fa..0000000
Binary files a/inc/CountryCodes/flags/et.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/eu.png b/inc/CountryCodes/flags/eu.png
deleted file mode 100644
index d6d8711..0000000
Binary files a/inc/CountryCodes/flags/eu.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/fam.png b/inc/CountryCodes/flags/fam.png
deleted file mode 100644
index cf50c75..0000000
Binary files a/inc/CountryCodes/flags/fam.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/fi.png b/inc/CountryCodes/flags/fi.png
deleted file mode 100644
index 14ec091..0000000
Binary files a/inc/CountryCodes/flags/fi.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/fj.png b/inc/CountryCodes/flags/fj.png
deleted file mode 100644
index cee9988..0000000
Binary files a/inc/CountryCodes/flags/fj.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/fk.png b/inc/CountryCodes/flags/fk.png
deleted file mode 100644
index ceaeb27..0000000
Binary files a/inc/CountryCodes/flags/fk.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/fm.png b/inc/CountryCodes/flags/fm.png
deleted file mode 100644
index 066bb24..0000000
Binary files a/inc/CountryCodes/flags/fm.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/fo.png b/inc/CountryCodes/flags/fo.png
deleted file mode 100644
index cbceb80..0000000
Binary files a/inc/CountryCodes/flags/fo.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/fr.png b/inc/CountryCodes/flags/fr.png
deleted file mode 100644
index 8332c4e..0000000
Binary files a/inc/CountryCodes/flags/fr.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ga.png b/inc/CountryCodes/flags/ga.png
deleted file mode 100644
index 0e0d434..0000000
Binary files a/inc/CountryCodes/flags/ga.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gb.png b/inc/CountryCodes/flags/gb.png
deleted file mode 100644
index ff701e1..0000000
Binary files a/inc/CountryCodes/flags/gb.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gd.png b/inc/CountryCodes/flags/gd.png
deleted file mode 100644
index 9ab57f5..0000000
Binary files a/inc/CountryCodes/flags/gd.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ge.png b/inc/CountryCodes/flags/ge.png
deleted file mode 100644
index 728d970..0000000
Binary files a/inc/CountryCodes/flags/ge.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gf.png b/inc/CountryCodes/flags/gf.png
deleted file mode 100644
index 8332c4e..0000000
Binary files a/inc/CountryCodes/flags/gf.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gh.png b/inc/CountryCodes/flags/gh.png
deleted file mode 100644
index 4e2f896..0000000
Binary files a/inc/CountryCodes/flags/gh.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gi.png b/inc/CountryCodes/flags/gi.png
deleted file mode 100644
index e76797f..0000000
Binary files a/inc/CountryCodes/flags/gi.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gl.png b/inc/CountryCodes/flags/gl.png
deleted file mode 100644
index ef12a73..0000000
Binary files a/inc/CountryCodes/flags/gl.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gm.png b/inc/CountryCodes/flags/gm.png
deleted file mode 100644
index 0720b66..0000000
Binary files a/inc/CountryCodes/flags/gm.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gn.png b/inc/CountryCodes/flags/gn.png
deleted file mode 100644
index ea660b0..0000000
Binary files a/inc/CountryCodes/flags/gn.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gp.png b/inc/CountryCodes/flags/gp.png
deleted file mode 100644
index dbb086d..0000000
Binary files a/inc/CountryCodes/flags/gp.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gq.png b/inc/CountryCodes/flags/gq.png
deleted file mode 100644
index ebe20a2..0000000
Binary files a/inc/CountryCodes/flags/gq.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gr.png b/inc/CountryCodes/flags/gr.png
deleted file mode 100644
index 8651ade..0000000
Binary files a/inc/CountryCodes/flags/gr.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gs.png b/inc/CountryCodes/flags/gs.png
deleted file mode 100644
index 7ef0bf5..0000000
Binary files a/inc/CountryCodes/flags/gs.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gt.png b/inc/CountryCodes/flags/gt.png
deleted file mode 100644
index c43a70d..0000000
Binary files a/inc/CountryCodes/flags/gt.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gu.png b/inc/CountryCodes/flags/gu.png
deleted file mode 100644
index 92f37c0..0000000
Binary files a/inc/CountryCodes/flags/gu.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gw.png b/inc/CountryCodes/flags/gw.png
deleted file mode 100644
index b37bcf0..0000000
Binary files a/inc/CountryCodes/flags/gw.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/gy.png b/inc/CountryCodes/flags/gy.png
deleted file mode 100644
index 22cbe2f..0000000
Binary files a/inc/CountryCodes/flags/gy.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/hk.png b/inc/CountryCodes/flags/hk.png
deleted file mode 100644
index d5c380c..0000000
Binary files a/inc/CountryCodes/flags/hk.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/hm.png b/inc/CountryCodes/flags/hm.png
deleted file mode 100644
index a01389a..0000000
Binary files a/inc/CountryCodes/flags/hm.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/hn.png b/inc/CountryCodes/flags/hn.png
deleted file mode 100644
index 96f8388..0000000
Binary files a/inc/CountryCodes/flags/hn.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/hr.png b/inc/CountryCodes/flags/hr.png
deleted file mode 100644
index 696b515..0000000
Binary files a/inc/CountryCodes/flags/hr.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ht.png b/inc/CountryCodes/flags/ht.png
deleted file mode 100644
index 416052a..0000000
Binary files a/inc/CountryCodes/flags/ht.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/hu.png b/inc/CountryCodes/flags/hu.png
deleted file mode 100644
index 7baafe4..0000000
Binary files a/inc/CountryCodes/flags/hu.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/id.png b/inc/CountryCodes/flags/id.png
deleted file mode 100644
index c6bc0fa..0000000
Binary files a/inc/CountryCodes/flags/id.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ie.png b/inc/CountryCodes/flags/ie.png
deleted file mode 100644
index 26baa31..0000000
Binary files a/inc/CountryCodes/flags/ie.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/il.png b/inc/CountryCodes/flags/il.png
deleted file mode 100644
index 2ca772d..0000000
Binary files a/inc/CountryCodes/flags/il.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/in.png b/inc/CountryCodes/flags/in.png
deleted file mode 100644
index e4d7e81..0000000
Binary files a/inc/CountryCodes/flags/in.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/io.png b/inc/CountryCodes/flags/io.png
deleted file mode 100644
index 3e74b6a..0000000
Binary files a/inc/CountryCodes/flags/io.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/iq.png b/inc/CountryCodes/flags/iq.png
deleted file mode 100644
index 878a351..0000000
Binary files a/inc/CountryCodes/flags/iq.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ir.png b/inc/CountryCodes/flags/ir.png
deleted file mode 100644
index c5fd136..0000000
Binary files a/inc/CountryCodes/flags/ir.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/is.png b/inc/CountryCodes/flags/is.png
deleted file mode 100644
index b8f6d0f..0000000
Binary files a/inc/CountryCodes/flags/is.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/it.png b/inc/CountryCodes/flags/it.png
deleted file mode 100644
index 89692f7..0000000
Binary files a/inc/CountryCodes/flags/it.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/jm.png b/inc/CountryCodes/flags/jm.png
deleted file mode 100644
index 7be119e..0000000
Binary files a/inc/CountryCodes/flags/jm.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/jo.png b/inc/CountryCodes/flags/jo.png
deleted file mode 100644
index 11bd497..0000000
Binary files a/inc/CountryCodes/flags/jo.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/jp.png b/inc/CountryCodes/flags/jp.png
deleted file mode 100644
index 325fbad..0000000
Binary files a/inc/CountryCodes/flags/jp.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ke.png b/inc/CountryCodes/flags/ke.png
deleted file mode 100644
index 51879ad..0000000
Binary files a/inc/CountryCodes/flags/ke.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/kg.png b/inc/CountryCodes/flags/kg.png
deleted file mode 100644
index 0a818f6..0000000
Binary files a/inc/CountryCodes/flags/kg.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/kh.png b/inc/CountryCodes/flags/kh.png
deleted file mode 100644
index 30f6bb1..0000000
Binary files a/inc/CountryCodes/flags/kh.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ki.png b/inc/CountryCodes/flags/ki.png
deleted file mode 100644
index 2dcce4b..0000000
Binary files a/inc/CountryCodes/flags/ki.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/km.png b/inc/CountryCodes/flags/km.png
deleted file mode 100644
index 812b2f5..0000000
Binary files a/inc/CountryCodes/flags/km.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/kn.png b/inc/CountryCodes/flags/kn.png
deleted file mode 100644
index febd5b4..0000000
Binary files a/inc/CountryCodes/flags/kn.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/kp.png b/inc/CountryCodes/flags/kp.png
deleted file mode 100644
index d3d509a..0000000
Binary files a/inc/CountryCodes/flags/kp.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/kr.png b/inc/CountryCodes/flags/kr.png
deleted file mode 100644
index 9c0a78e..0000000
Binary files a/inc/CountryCodes/flags/kr.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/kw.png b/inc/CountryCodes/flags/kw.png
deleted file mode 100644
index 96546da..0000000
Binary files a/inc/CountryCodes/flags/kw.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ky.png b/inc/CountryCodes/flags/ky.png
deleted file mode 100644
index 15c5f8e..0000000
Binary files a/inc/CountryCodes/flags/ky.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/kz.png b/inc/CountryCodes/flags/kz.png
deleted file mode 100644
index 45a8c88..0000000
Binary files a/inc/CountryCodes/flags/kz.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/la.png b/inc/CountryCodes/flags/la.png
deleted file mode 100644
index e28acd0..0000000
Binary files a/inc/CountryCodes/flags/la.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/lb.png b/inc/CountryCodes/flags/lb.png
deleted file mode 100644
index d0d452b..0000000
Binary files a/inc/CountryCodes/flags/lb.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/lc.png b/inc/CountryCodes/flags/lc.png
deleted file mode 100644
index a47d065..0000000
Binary files a/inc/CountryCodes/flags/lc.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/li.png b/inc/CountryCodes/flags/li.png
deleted file mode 100644
index 6469909..0000000
Binary files a/inc/CountryCodes/flags/li.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/lk.png b/inc/CountryCodes/flags/lk.png
deleted file mode 100644
index 088aad6..0000000
Binary files a/inc/CountryCodes/flags/lk.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/lr.png b/inc/CountryCodes/flags/lr.png
deleted file mode 100644
index 89a5bc7..0000000
Binary files a/inc/CountryCodes/flags/lr.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ls.png b/inc/CountryCodes/flags/ls.png
deleted file mode 100644
index 33fdef1..0000000
Binary files a/inc/CountryCodes/flags/ls.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/lt.png b/inc/CountryCodes/flags/lt.png
deleted file mode 100644
index c8ef0da..0000000
Binary files a/inc/CountryCodes/flags/lt.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/lu.png b/inc/CountryCodes/flags/lu.png
deleted file mode 100644
index 4cabba9..0000000
Binary files a/inc/CountryCodes/flags/lu.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/lv.png b/inc/CountryCodes/flags/lv.png
deleted file mode 100644
index 49b6998..0000000
Binary files a/inc/CountryCodes/flags/lv.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ly.png b/inc/CountryCodes/flags/ly.png
deleted file mode 100644
index b163a9f..0000000
Binary files a/inc/CountryCodes/flags/ly.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ma.png b/inc/CountryCodes/flags/ma.png
deleted file mode 100644
index f386770..0000000
Binary files a/inc/CountryCodes/flags/ma.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mc.png b/inc/CountryCodes/flags/mc.png
deleted file mode 100644
index 1aa830f..0000000
Binary files a/inc/CountryCodes/flags/mc.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/md.png b/inc/CountryCodes/flags/md.png
deleted file mode 100644
index 4e92c18..0000000
Binary files a/inc/CountryCodes/flags/md.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/me.png b/inc/CountryCodes/flags/me.png
deleted file mode 100644
index ac72535..0000000
Binary files a/inc/CountryCodes/flags/me.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mg.png b/inc/CountryCodes/flags/mg.png
deleted file mode 100644
index d2715b3..0000000
Binary files a/inc/CountryCodes/flags/mg.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mh.png b/inc/CountryCodes/flags/mh.png
deleted file mode 100644
index fb523a8..0000000
Binary files a/inc/CountryCodes/flags/mh.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mk.png b/inc/CountryCodes/flags/mk.png
deleted file mode 100644
index db173aa..0000000
Binary files a/inc/CountryCodes/flags/mk.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ml.png b/inc/CountryCodes/flags/ml.png
deleted file mode 100644
index 2cec8ba..0000000
Binary files a/inc/CountryCodes/flags/ml.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mm.png b/inc/CountryCodes/flags/mm.png
deleted file mode 100644
index f464f67..0000000
Binary files a/inc/CountryCodes/flags/mm.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mn.png b/inc/CountryCodes/flags/mn.png
deleted file mode 100644
index 9396355..0000000
Binary files a/inc/CountryCodes/flags/mn.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mo.png b/inc/CountryCodes/flags/mo.png
deleted file mode 100644
index deb801d..0000000
Binary files a/inc/CountryCodes/flags/mo.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mp.png b/inc/CountryCodes/flags/mp.png
deleted file mode 100644
index 298d588..0000000
Binary files a/inc/CountryCodes/flags/mp.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mq.png b/inc/CountryCodes/flags/mq.png
deleted file mode 100644
index 010143b..0000000
Binary files a/inc/CountryCodes/flags/mq.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mr.png b/inc/CountryCodes/flags/mr.png
deleted file mode 100644
index 319546b..0000000
Binary files a/inc/CountryCodes/flags/mr.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ms.png b/inc/CountryCodes/flags/ms.png
deleted file mode 100644
index d4cbb43..0000000
Binary files a/inc/CountryCodes/flags/ms.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mt.png b/inc/CountryCodes/flags/mt.png
deleted file mode 100644
index 00af948..0000000
Binary files a/inc/CountryCodes/flags/mt.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mu.png b/inc/CountryCodes/flags/mu.png
deleted file mode 100644
index b7fdce1..0000000
Binary files a/inc/CountryCodes/flags/mu.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mv.png b/inc/CountryCodes/flags/mv.png
deleted file mode 100644
index 5073d9e..0000000
Binary files a/inc/CountryCodes/flags/mv.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mw.png b/inc/CountryCodes/flags/mw.png
deleted file mode 100644
index 13886e9..0000000
Binary files a/inc/CountryCodes/flags/mw.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mx.png b/inc/CountryCodes/flags/mx.png
deleted file mode 100644
index 5bc58ab..0000000
Binary files a/inc/CountryCodes/flags/mx.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/my.png b/inc/CountryCodes/flags/my.png
deleted file mode 100644
index 9034cba..0000000
Binary files a/inc/CountryCodes/flags/my.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/mz.png b/inc/CountryCodes/flags/mz.png
deleted file mode 100644
index 76405e0..0000000
Binary files a/inc/CountryCodes/flags/mz.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/na.png b/inc/CountryCodes/flags/na.png
deleted file mode 100644
index 63358c6..0000000
Binary files a/inc/CountryCodes/flags/na.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/nc.png b/inc/CountryCodes/flags/nc.png
deleted file mode 100644
index 2cad283..0000000
Binary files a/inc/CountryCodes/flags/nc.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ne.png b/inc/CountryCodes/flags/ne.png
deleted file mode 100644
index d85f424..0000000
Binary files a/inc/CountryCodes/flags/ne.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/nf.png b/inc/CountryCodes/flags/nf.png
deleted file mode 100644
index f9bcdda..0000000
Binary files a/inc/CountryCodes/flags/nf.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ng.png b/inc/CountryCodes/flags/ng.png
deleted file mode 100644
index 3eea2e0..0000000
Binary files a/inc/CountryCodes/flags/ng.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ni.png b/inc/CountryCodes/flags/ni.png
deleted file mode 100644
index 3969aaa..0000000
Binary files a/inc/CountryCodes/flags/ni.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/nl.png b/inc/CountryCodes/flags/nl.png
deleted file mode 100644
index fe44791..0000000
Binary files a/inc/CountryCodes/flags/nl.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/no.png b/inc/CountryCodes/flags/no.png
deleted file mode 100644
index 160b6b5..0000000
Binary files a/inc/CountryCodes/flags/no.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/np.png b/inc/CountryCodes/flags/np.png
deleted file mode 100644
index aeb058b..0000000
Binary files a/inc/CountryCodes/flags/np.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/nr.png b/inc/CountryCodes/flags/nr.png
deleted file mode 100644
index 705fc33..0000000
Binary files a/inc/CountryCodes/flags/nr.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/nu.png b/inc/CountryCodes/flags/nu.png
deleted file mode 100644
index c3ce4ae..0000000
Binary files a/inc/CountryCodes/flags/nu.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/nz.png b/inc/CountryCodes/flags/nz.png
deleted file mode 100644
index 10d6306..0000000
Binary files a/inc/CountryCodes/flags/nz.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/om.png b/inc/CountryCodes/flags/om.png
deleted file mode 100644
index 2ffba7e..0000000
Binary files a/inc/CountryCodes/flags/om.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/pa.png b/inc/CountryCodes/flags/pa.png
deleted file mode 100644
index 9b2ee9a..0000000
Binary files a/inc/CountryCodes/flags/pa.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/pe.png b/inc/CountryCodes/flags/pe.png
deleted file mode 100644
index 62a0497..0000000
Binary files a/inc/CountryCodes/flags/pe.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/pf.png b/inc/CountryCodes/flags/pf.png
deleted file mode 100644
index 771a0f6..0000000
Binary files a/inc/CountryCodes/flags/pf.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/pg.png b/inc/CountryCodes/flags/pg.png
deleted file mode 100644
index 10d6233..0000000
Binary files a/inc/CountryCodes/flags/pg.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ph.png b/inc/CountryCodes/flags/ph.png
deleted file mode 100644
index b89e159..0000000
Binary files a/inc/CountryCodes/flags/ph.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/pk.png b/inc/CountryCodes/flags/pk.png
deleted file mode 100644
index e9df70c..0000000
Binary files a/inc/CountryCodes/flags/pk.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/pl.png b/inc/CountryCodes/flags/pl.png
deleted file mode 100644
index d413d01..0000000
Binary files a/inc/CountryCodes/flags/pl.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/pm.png b/inc/CountryCodes/flags/pm.png
deleted file mode 100644
index ba91d2c..0000000
Binary files a/inc/CountryCodes/flags/pm.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/pn.png b/inc/CountryCodes/flags/pn.png
deleted file mode 100644
index aa9344f..0000000
Binary files a/inc/CountryCodes/flags/pn.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/pr.png b/inc/CountryCodes/flags/pr.png
deleted file mode 100644
index 82d9130..0000000
Binary files a/inc/CountryCodes/flags/pr.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ps.png b/inc/CountryCodes/flags/ps.png
deleted file mode 100644
index f5f5477..0000000
Binary files a/inc/CountryCodes/flags/ps.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/pt.png b/inc/CountryCodes/flags/pt.png
deleted file mode 100644
index ece7980..0000000
Binary files a/inc/CountryCodes/flags/pt.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/pw.png b/inc/CountryCodes/flags/pw.png
deleted file mode 100644
index 6178b25..0000000
Binary files a/inc/CountryCodes/flags/pw.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/py.png b/inc/CountryCodes/flags/py.png
deleted file mode 100644
index cb8723c..0000000
Binary files a/inc/CountryCodes/flags/py.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/qa.png b/inc/CountryCodes/flags/qa.png
deleted file mode 100644
index ed4c621..0000000
Binary files a/inc/CountryCodes/flags/qa.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/re.png b/inc/CountryCodes/flags/re.png
deleted file mode 100644
index 8332c4e..0000000
Binary files a/inc/CountryCodes/flags/re.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ro.png b/inc/CountryCodes/flags/ro.png
deleted file mode 100644
index 57e74a6..0000000
Binary files a/inc/CountryCodes/flags/ro.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/rs.png b/inc/CountryCodes/flags/rs.png
deleted file mode 100644
index 9439a5b..0000000
Binary files a/inc/CountryCodes/flags/rs.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ru.png b/inc/CountryCodes/flags/ru.png
deleted file mode 100644
index 47da421..0000000
Binary files a/inc/CountryCodes/flags/ru.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/rw.png b/inc/CountryCodes/flags/rw.png
deleted file mode 100644
index 5356491..0000000
Binary files a/inc/CountryCodes/flags/rw.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sa.png b/inc/CountryCodes/flags/sa.png
deleted file mode 100644
index b4641c7..0000000
Binary files a/inc/CountryCodes/flags/sa.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sb.png b/inc/CountryCodes/flags/sb.png
deleted file mode 100644
index a9937cc..0000000
Binary files a/inc/CountryCodes/flags/sb.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sc.png b/inc/CountryCodes/flags/sc.png
deleted file mode 100644
index 39ee371..0000000
Binary files a/inc/CountryCodes/flags/sc.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/scotland.png b/inc/CountryCodes/flags/scotland.png
deleted file mode 100644
index a0e57b4..0000000
Binary files a/inc/CountryCodes/flags/scotland.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sd.png b/inc/CountryCodes/flags/sd.png
deleted file mode 100644
index eaab69e..0000000
Binary files a/inc/CountryCodes/flags/sd.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/se.png b/inc/CountryCodes/flags/se.png
deleted file mode 100644
index 1994653..0000000
Binary files a/inc/CountryCodes/flags/se.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sg.png b/inc/CountryCodes/flags/sg.png
deleted file mode 100644
index dd34d61..0000000
Binary files a/inc/CountryCodes/flags/sg.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sh.png b/inc/CountryCodes/flags/sh.png
deleted file mode 100644
index 4b1d2a2..0000000
Binary files a/inc/CountryCodes/flags/sh.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/si.png b/inc/CountryCodes/flags/si.png
deleted file mode 100644
index bb1476f..0000000
Binary files a/inc/CountryCodes/flags/si.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sj.png b/inc/CountryCodes/flags/sj.png
deleted file mode 100644
index 160b6b5..0000000
Binary files a/inc/CountryCodes/flags/sj.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sk.png b/inc/CountryCodes/flags/sk.png
deleted file mode 100644
index 7ccbc82..0000000
Binary files a/inc/CountryCodes/flags/sk.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sl.png b/inc/CountryCodes/flags/sl.png
deleted file mode 100644
index 12d812d..0000000
Binary files a/inc/CountryCodes/flags/sl.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sm.png b/inc/CountryCodes/flags/sm.png
deleted file mode 100644
index 3df2fdc..0000000
Binary files a/inc/CountryCodes/flags/sm.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sn.png b/inc/CountryCodes/flags/sn.png
deleted file mode 100644
index eabb71d..0000000
Binary files a/inc/CountryCodes/flags/sn.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/so.png b/inc/CountryCodes/flags/so.png
deleted file mode 100644
index 4a1ea4b..0000000
Binary files a/inc/CountryCodes/flags/so.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sr.png b/inc/CountryCodes/flags/sr.png
deleted file mode 100644
index 5eff927..0000000
Binary files a/inc/CountryCodes/flags/sr.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/st.png b/inc/CountryCodes/flags/st.png
deleted file mode 100644
index 2978557..0000000
Binary files a/inc/CountryCodes/flags/st.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sv.png b/inc/CountryCodes/flags/sv.png
deleted file mode 100644
index 2498799..0000000
Binary files a/inc/CountryCodes/flags/sv.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sy.png b/inc/CountryCodes/flags/sy.png
deleted file mode 100644
index f5ce30d..0000000
Binary files a/inc/CountryCodes/flags/sy.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/sz.png b/inc/CountryCodes/flags/sz.png
deleted file mode 100644
index 914ee86..0000000
Binary files a/inc/CountryCodes/flags/sz.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/tc.png b/inc/CountryCodes/flags/tc.png
deleted file mode 100644
index 8fc1156..0000000
Binary files a/inc/CountryCodes/flags/tc.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/td.png b/inc/CountryCodes/flags/td.png
deleted file mode 100644
index 667f21f..0000000
Binary files a/inc/CountryCodes/flags/td.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/tf.png b/inc/CountryCodes/flags/tf.png
deleted file mode 100644
index 80529a4..0000000
Binary files a/inc/CountryCodes/flags/tf.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/tg.png b/inc/CountryCodes/flags/tg.png
deleted file mode 100644
index 3aa00ad..0000000
Binary files a/inc/CountryCodes/flags/tg.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/th.png b/inc/CountryCodes/flags/th.png
deleted file mode 100644
index dd8ba91..0000000
Binary files a/inc/CountryCodes/flags/th.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/tj.png b/inc/CountryCodes/flags/tj.png
deleted file mode 100644
index 617bf64..0000000
Binary files a/inc/CountryCodes/flags/tj.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/tk.png b/inc/CountryCodes/flags/tk.png
deleted file mode 100644
index 67b8c8c..0000000
Binary files a/inc/CountryCodes/flags/tk.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/tl.png b/inc/CountryCodes/flags/tl.png
deleted file mode 100644
index 77da181..0000000
Binary files a/inc/CountryCodes/flags/tl.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/tm.png b/inc/CountryCodes/flags/tm.png
deleted file mode 100644
index 828020e..0000000
Binary files a/inc/CountryCodes/flags/tm.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/tn.png b/inc/CountryCodes/flags/tn.png
deleted file mode 100644
index 183cdd3..0000000
Binary files a/inc/CountryCodes/flags/tn.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/to.png b/inc/CountryCodes/flags/to.png
deleted file mode 100644
index f89b8ba..0000000
Binary files a/inc/CountryCodes/flags/to.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/tr.png b/inc/CountryCodes/flags/tr.png
deleted file mode 100644
index be32f77..0000000
Binary files a/inc/CountryCodes/flags/tr.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/tt.png b/inc/CountryCodes/flags/tt.png
deleted file mode 100644
index 2a11c1e..0000000
Binary files a/inc/CountryCodes/flags/tt.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/tv.png b/inc/CountryCodes/flags/tv.png
deleted file mode 100644
index 28274c5..0000000
Binary files a/inc/CountryCodes/flags/tv.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/tw.png b/inc/CountryCodes/flags/tw.png
deleted file mode 100644
index f31c654..0000000
Binary files a/inc/CountryCodes/flags/tw.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/tz.png b/inc/CountryCodes/flags/tz.png
deleted file mode 100644
index c00ff79..0000000
Binary files a/inc/CountryCodes/flags/tz.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ua.png b/inc/CountryCodes/flags/ua.png
deleted file mode 100644
index 09563a2..0000000
Binary files a/inc/CountryCodes/flags/ua.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ug.png b/inc/CountryCodes/flags/ug.png
deleted file mode 100644
index 33f4aff..0000000
Binary files a/inc/CountryCodes/flags/ug.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/uk.png b/inc/CountryCodes/flags/uk.png
deleted file mode 100644
index ff701e1..0000000
Binary files a/inc/CountryCodes/flags/uk.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/um.png b/inc/CountryCodes/flags/um.png
deleted file mode 100644
index c1dd965..0000000
Binary files a/inc/CountryCodes/flags/um.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/us.png b/inc/CountryCodes/flags/us.png
deleted file mode 100644
index 10f451f..0000000
Binary files a/inc/CountryCodes/flags/us.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/uy.png b/inc/CountryCodes/flags/uy.png
deleted file mode 100644
index 31d948a..0000000
Binary files a/inc/CountryCodes/flags/uy.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/uz.png b/inc/CountryCodes/flags/uz.png
deleted file mode 100644
index fef5dc1..0000000
Binary files a/inc/CountryCodes/flags/uz.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/va.png b/inc/CountryCodes/flags/va.png
deleted file mode 100644
index b31eaf2..0000000
Binary files a/inc/CountryCodes/flags/va.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/vc.png b/inc/CountryCodes/flags/vc.png
deleted file mode 100644
index 8fa17b0..0000000
Binary files a/inc/CountryCodes/flags/vc.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ve.png b/inc/CountryCodes/flags/ve.png
deleted file mode 100644
index 00c90f9..0000000
Binary files a/inc/CountryCodes/flags/ve.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/vg.png b/inc/CountryCodes/flags/vg.png
deleted file mode 100644
index 4156907..0000000
Binary files a/inc/CountryCodes/flags/vg.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/vi.png b/inc/CountryCodes/flags/vi.png
deleted file mode 100644
index ed26915..0000000
Binary files a/inc/CountryCodes/flags/vi.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/vn.png b/inc/CountryCodes/flags/vn.png
deleted file mode 100644
index ec7cd48..0000000
Binary files a/inc/CountryCodes/flags/vn.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/vu.png b/inc/CountryCodes/flags/vu.png
deleted file mode 100644
index b3397bc..0000000
Binary files a/inc/CountryCodes/flags/vu.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/wales.png b/inc/CountryCodes/flags/wales.png
deleted file mode 100644
index e0d7cee..0000000
Binary files a/inc/CountryCodes/flags/wales.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/wf.png b/inc/CountryCodes/flags/wf.png
deleted file mode 100644
index 9f95587..0000000
Binary files a/inc/CountryCodes/flags/wf.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ws.png b/inc/CountryCodes/flags/ws.png
deleted file mode 100644
index c169508..0000000
Binary files a/inc/CountryCodes/flags/ws.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/ye.png b/inc/CountryCodes/flags/ye.png
deleted file mode 100644
index 468dfad..0000000
Binary files a/inc/CountryCodes/flags/ye.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/yt.png b/inc/CountryCodes/flags/yt.png
deleted file mode 100644
index c298f37..0000000
Binary files a/inc/CountryCodes/flags/yt.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/za.png b/inc/CountryCodes/flags/za.png
deleted file mode 100644
index 57c58e2..0000000
Binary files a/inc/CountryCodes/flags/za.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/zm.png b/inc/CountryCodes/flags/zm.png
deleted file mode 100644
index c25b07b..0000000
Binary files a/inc/CountryCodes/flags/zm.png and /dev/null differ
diff --git a/inc/CountryCodes/flags/zw.png b/inc/CountryCodes/flags/zw.png
deleted file mode 100644
index 53c9725..0000000
Binary files a/inc/CountryCodes/flags/zw.png and /dev/null differ