Index: CRM/Core/IDS.php
===================================================================
--- CRM/Core/IDS.php
+++ CRM/Core/IDS.php
@@ -71,7 +71,7 @@
       $_REQUEST['IDS_user_agent'] = $_SERVER['HTTP_USER_AGENT'];
     }
 
-    require_once 'IDS/Init.php';
+    require_once 'IDS/lib/IDS/Init.php';
 
     // init the PHPIDS and pass the REQUEST array
     $config = CRM_Core_Config::singleton();
@@ -86,9 +86,9 @@
       $contents = "
 [General]
     filter_type         = xml
-    filter_path         = {$civicrm_root}/packages/IDS/default_filter.xml
+    filter_path         = {$civicrm_root}/packages/IDS/lib/IDS/default_filter.xml
     tmp_path            = $tmpDir
-    HTML_Purifier_Path  = IDS/vendors/htmlpurifier/HTMLPurifier.auto.php
+    HTML_Purifier_Path  = IDS/lib/IDS/vendors/htmlpurifier/HTMLPurifier.auto.php
     HTML_Purifier_Cache = $tmpDir
     scan_keys           = false
     exceptions[]        = __utmz
@@ -124,7 +124,7 @@
     exceptions[]        = instructions
     exceptions[]        = suggested_message
     exceptions[]        = page_text
-";
+  ";
       if (file_put_contents($configFile, $contents) === FALSE) {
         CRM_Core_Error::movedSiteError($configFile);
       }
       
Index: Filter/Storage.php
===================================================================
--- packages/IDS/lib/IDS/Filter/Storage.php	
+++ packages/IDS/lib/IDS/Filter/Storage.php	
@@ -230,7 +230,7 @@
             $nocache = $filters instanceof SimpleXMLElement;
             $filters = $nocache ? $filters->filter : $filters;
 
-            include_once 'IDS/Filter.php';
+            include_once 'IDS/lib/IDS/Filter.php';
 
             foreach ($filters as $filter) {
 
Index: Init.php
===================================================================
--- packages/IDS/lib/IDS/Init.php	
+++ packages/IDS/lib/IDS/Init.php	
@@ -84,8 +84,8 @@
      */
     private function __construct($configPath = null) 
     {
-        include_once 'IDS/Monitor.php';
-        include_once 'IDS/Filter/Storage.php';
+        include_once 'IDS/lib/IDS/Monitor.php';
+        include_once 'IDS/lib/IDS/Filter/Storage.php';
 
         if ($configPath) {
             $this->setConfigPath($configPath);
Index: Monitor.php
===================================================================
--- packages/IDS/lib/IDS/Monitor.php
+++ packages/IDS/lib/IDS/Monitor.php
@@ -223,7 +223,7 @@
             );
         }
 
-        include_once 'IDS/Report.php';
+        include_once 'IDS/lib/IDS/Report.php';
         $this->report = new IDS_Report;
     }
 
@@ -260,7 +260,7 @@
             if (is_string($value)) {
 
                 if ($filter = $this->_detect($key, $value)) {
-                    include_once 'IDS/Event.php';
+                    include_once 'IDS/lib/IDS/Event.php';
                     $this->report->addEvent(
                         new IDS_Event(
                             $key,
@@ -342,7 +342,7 @@
         }
 
         // use the converter
-        include_once 'IDS/Converter.php';
+        include_once 'IDS/lib/IDS/Converter.php';
         $value = IDS_Converter::runAll($value);
         $value = IDS_Converter::runCentrifuge($value, $this);