diff --git a/emailtracking/build.xml b/build.xml
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/build.xml
rename to build.xml
diff --git a/emailtracking/config.php b/config.php
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/config.php
rename to config.php
diff --git a/emailtracking/.idea/.name b/emailtracking/.idea/.name
deleted file mode 100644
index a255bf6..0000000
--- a/emailtracking/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-emailtracking
\ No newline at end of file
diff --git a/emailtracking/.idea/emailtracking.iml b/emailtracking/.idea/emailtracking.iml
deleted file mode 100644
index c956989..0000000
--- a/emailtracking/.idea/emailtracking.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/emailtracking/.idea/encodings.xml b/emailtracking/.idea/encodings.xml
deleted file mode 100644
index d821048..0000000
--- a/emailtracking/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/emailtracking/.idea/misc.xml b/emailtracking/.idea/misc.xml
deleted file mode 100644
index c753c0f..0000000
--- a/emailtracking/.idea/misc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/emailtracking/.idea/modules.xml b/emailtracking/.idea/modules.xml
deleted file mode 100644
index 30add55..0000000
--- a/emailtracking/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/emailtracking/.idea/scopes/scope_settings.xml b/emailtracking/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/emailtracking/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/emailtracking/.idea/vcs.xml b/emailtracking/.idea/vcs.xml
deleted file mode 100644
index 78e665f..0000000
--- a/emailtracking/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/emailtracking/.idea/workspace.xml b/emailtracking/.idea/workspace.xml
deleted file mode 100644
index 2f15ba1..0000000
--- a/emailtracking/.idea/workspace.xml
+++ /dev/null
@@ -1,767 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
- $USER_HOME$/.subversion
- 125
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1425490373578
-
- 1425490373578
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/emailtracking/js/EmailTrackingPlugin.js b/js/EmailTrackingPlugin.js
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/js/EmailTrackingPlugin.js
rename to js/EmailTrackingPlugin.js
diff --git a/emailtracking/js/data/ResponseHandler.js b/js/data/ResponseHandler.js
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/js/data/ResponseHandler.js
rename to js/data/ResponseHandler.js
diff --git a/emailtracking/js/ui/TrackingInfoPanel.js b/js/ui/TrackingInfoPanel.js
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/js/ui/TrackingInfoPanel.js
rename to js/ui/TrackingInfoPanel.js
diff --git a/emailtracking/manifest.xml b/manifest.xml
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/manifest.xml
rename to manifest.xml
diff --git a/emailtracking/php/class.plugintrackingmodule.php b/php/class.plugintrackingmodule.php
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/php/class.plugintrackingmodule.php
rename to php/class.plugintrackingmodule.php
diff --git a/emailtracking/php/lib/class.EmailTracker.php b/php/lib/class.EmailTracker.php
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/php/lib/class.EmailTracker.php
rename to php/lib/class.EmailTracker.php
diff --git a/emailtracking/php/lib/database_structure.sql b/php/lib/database_structure.sql
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/php/lib/database_structure.sql
rename to php/lib/database_structure.sql
diff --git a/emailtracking/php/lib/medoo.php b/php/lib/medoo.php
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/php/lib/medoo.php
rename to php/lib/medoo.php
diff --git a/emailtracking/php/plugin.emailtracking.php b/php/plugin.emailtracking.php
old mode 100644
new mode 100755
similarity index 98%
rename from emailtracking/php/plugin.emailtracking.php
rename to php/plugin.emailtracking.php
index 6732a17..bd7d906
--- a/emailtracking/php/plugin.emailtracking.php
+++ b/php/plugin.emailtracking.php
@@ -86,7 +86,7 @@ class Pluginemailtracking extends Plugin {
// add the tracking html tags to the body
$trackingHTML = '';
- $trackingHTML .= '';
+ $trackingHTML .= '';
// stream the body and add the tracking changes!
$messageStream = mapi_openproperty($message, PR_HTML, IID_IStream, 0, 0);
diff --git a/emailtracking/php/track.php b/php/track.php
old mode 100644
new mode 100755
similarity index 79%
rename from emailtracking/php/track.php
rename to php/track.php
index 293800d..8c7718f
--- a/emailtracking/php/track.php
+++ b/php/track.php
@@ -27,10 +27,6 @@ if(!empty($trackingID) && $type !== "none") {
// log it to db
$dbObj->addLog($trackingID, $data);
-
- // respond transparent 1x1 image
- @header('Content-Type: image/png');
- echo base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACnej3aAAAAAXRSTlMAQObYZgAAAApJREFUCNdjYAAAAAIAAeIhvDMAAAAASUVORK5CYII=');
} else {
echo "Powerful you have become, the dark side I sense in you.";
-}
+}
\ No newline at end of file
diff --git a/emailtracking/resources/css/emailtracking-styles.css b/resources/css/emailtracking-styles.css
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/resources/css/emailtracking-styles.css
rename to resources/css/emailtracking-styles.css
diff --git a/emailtracking/resources/icons/ico_tracking_off.png b/resources/icons/ico_tracking_off.png
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/resources/icons/ico_tracking_off.png
rename to resources/icons/ico_tracking_off.png
diff --git a/emailtracking/resources/icons/ico_tracking_on.png b/resources/icons/ico_tracking_on.png
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/resources/icons/ico_tracking_on.png
rename to resources/icons/ico_tracking_on.png
diff --git a/emailtracking/resources/icons/ico_trackingxcf.xcf b/resources/icons/ico_trackingxcf.xcf
old mode 100644
new mode 100755
similarity index 100%
rename from emailtracking/resources/icons/ico_trackingxcf.xcf
rename to resources/icons/ico_trackingxcf.xcf