diff --git a/lib/aggregator.js b/lib/aggregators/aggregator.js
similarity index 95%
rename from lib/aggregator.js
rename to lib/aggregators/aggregator.js
index bd7c9828d..3ba9eece7 100644
--- a/lib/aggregator.js
+++ b/lib/aggregators/aggregator.js
@@ -5,7 +5,7 @@
  * Released under the Apache 2.0 License
  */
 var Stats = require('fast-stats').Stats;
-var util = require('./util/util');
+var util = require('../util/util');
 
 /**
  * Create a aggregator that collects and aggregates statistics from web pages.
@@ -46,4 +46,4 @@ Aggregator.prototype.clear = function() {
   this.stats.reset();
 };
 
-module.exports = Aggregator;
\ No newline at end of file
+module.exports = Aggregator;
diff --git a/lib/aggregators/gpsi/requests.js b/lib/aggregators/gpsi/requests.js
index 08e95724a..d0e232977 100644
--- a/lib/aggregators/gpsi/requests.js
+++ b/lib/aggregators/gpsi/requests.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator'),
+var Aggregator = require('../aggregator'),
   log = require('winston');
 
 module.exports = new Aggregator('requestsGPSI', 'Number of requests per page (gpsi)',
@@ -19,4 +19,4 @@ module.exports = new Aggregator('requestsGPSI', 'Number of requests per page (gp
         log.log('error', 'Non existing pageStats for ' + pageData.gpsi.id);
       }
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/gpsi/score.js b/lib/aggregators/gpsi/score.js
index aa80e6220..bcc0c98d3 100644
--- a/lib/aggregators/gpsi/score.js
+++ b/lib/aggregators/gpsi/score.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('scoreGPSI', 'Google Page Speed Insights Score',
   'The score calculated by our friends at Google.', 'rule',
@@ -13,4 +13,4 @@ module.exports = new Aggregator('scoreGPSI', 'Google Page Speed Insights Score',
     if (pageData.gpsi) {
       this.stats.push(pageData.gpsi.score);
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/firstViewBytes.js b/lib/aggregators/webpagetest/firstViewBytes.js
index ba4bbd8b1..51b757999 100644
--- a/lib/aggregators/webpagetest/firstViewBytes.js
+++ b/lib/aggregators/webpagetest/firstViewBytes.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('firstViewBytesWPT',
   'Size First View',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('firstViewBytesWPT',
         stats.push(run.firstView.results.bytesIn);
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/firstViewFirstPaint.js b/lib/aggregators/webpagetest/firstViewFirstPaint.js
index 6986517db..170bfffcd 100644
--- a/lib/aggregators/webpagetest/firstViewFirstPaint.js
+++ b/lib/aggregators/webpagetest/firstViewFirstPaint.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('firstViewFirstPaintWPT',
   'First Paint First View',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('firstViewFirstPaintWPT',
         stats.push(run.firstView.results.firstPaint);
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/firstViewLoadTime.js b/lib/aggregators/webpagetest/firstViewLoadTime.js
index ced03871c..e80c86571 100644
--- a/lib/aggregators/webpagetest/firstViewLoadTime.js
+++ b/lib/aggregators/webpagetest/firstViewLoadTime.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('firstViewLoadTimeWPT',
   'Load Time First View',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('firstViewLoadTimeWPT',
         stats.push(run.firstView.results.loadTime);
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/firstViewRequest.js b/lib/aggregators/webpagetest/firstViewRequest.js
index e793782d2..99ffc020f 100644
--- a/lib/aggregators/webpagetest/firstViewRequest.js
+++ b/lib/aggregators/webpagetest/firstViewRequest.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('firstViewRequestsWPT',
   'Requests First View',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('firstViewRequestsWPT',
         stats.push(run.firstView.results.requests);
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/firstViewSpeedIndex.js b/lib/aggregators/webpagetest/firstViewSpeedIndex.js
index d9885c3c6..9241e105d 100644
--- a/lib/aggregators/webpagetest/firstViewSpeedIndex.js
+++ b/lib/aggregators/webpagetest/firstViewSpeedIndex.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('firstViewSpeedIndexWPT',
   'Speed Index First View',
@@ -17,4 +17,4 @@ module.exports = new Aggregator('firstViewSpeedIndexWPT',
         stats.push(run.firstView.results.SpeedIndex);
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/firstViewTTFB.js b/lib/aggregators/webpagetest/firstViewTTFB.js
index 2e51e06de..03ec2d77d 100644
--- a/lib/aggregators/webpagetest/firstViewTTFB.js
+++ b/lib/aggregators/webpagetest/firstViewTTFB.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('firstViewTTFBWPT',
   'TTFB First View',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('firstViewTTFBWPT',
         stats.push(run.firstView.results.TTFB);
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/firstViewVisualComplete.js b/lib/aggregators/webpagetest/firstViewVisualComplete.js
index 2a1306d65..c66cb72f1 100644
--- a/lib/aggregators/webpagetest/firstViewVisualComplete.js
+++ b/lib/aggregators/webpagetest/firstViewVisualComplete.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('firstViewVisualCompleteWPT',
   'Visual Complete First View',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('firstViewVisualCompleteWPT',
         stats.push(run.firstView.results.visualComplete);
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/imageSavings.js b/lib/aggregators/webpagetest/imageSavings.js
index 4c6b9d9e5..250d64fa0 100644
--- a/lib/aggregators/webpagetest/imageSavings.js
+++ b/lib/aggregators/webpagetest/imageSavings.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('imageSavingsWPT',
   'Image Savings',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('imageSavingsWPT',
         stats.push(run.firstView.results.image_savings); // jshint ignore:line
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/imageTotal.js b/lib/aggregators/webpagetest/imageTotal.js
index c345bc77f..3f0ed10cb 100644
--- a/lib/aggregators/webpagetest/imageTotal.js
+++ b/lib/aggregators/webpagetest/imageTotal.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('imageTotalWPT',
   'Image size',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('imageTotalWPT',
         stats.push(run.firstView.results.image_total); // jshint ignore:line
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/repeatViewBytes.js b/lib/aggregators/webpagetest/repeatViewBytes.js
index c96e6eb8e..85ebe32ca 100644
--- a/lib/aggregators/webpagetest/repeatViewBytes.js
+++ b/lib/aggregators/webpagetest/repeatViewBytes.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('firstViewBytesWPT',
   'Size Repeat View',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('firstViewBytesWPT',
         stats.push(run.repeatView.results.bytesIn);
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/repeatViewFirstPaint.js b/lib/aggregators/webpagetest/repeatViewFirstPaint.js
index dc10f17db..235ba488b 100644
--- a/lib/aggregators/webpagetest/repeatViewFirstPaint.js
+++ b/lib/aggregators/webpagetest/repeatViewFirstPaint.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('repeatViewFirstPaintWPT',
   'First Paint Repeat View',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('repeatViewFirstPaintWPT',
         stats.push(run.repeatView.results.firstPaint);
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/repeatViewLoadTime.js b/lib/aggregators/webpagetest/repeatViewLoadTime.js
index dcf76e451..8591f62b4 100644
--- a/lib/aggregators/webpagetest/repeatViewLoadTime.js
+++ b/lib/aggregators/webpagetest/repeatViewLoadTime.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('repeatViewLoadTimeWPT',
   'Load Time Repeat View',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('repeatViewLoadTimeWPT',
         stats.push(run.repeatView.results.loadTime);
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/repeatViewRequest.js b/lib/aggregators/webpagetest/repeatViewRequest.js
index 87cfac052..d540096a3 100644
--- a/lib/aggregators/webpagetest/repeatViewRequest.js
+++ b/lib/aggregators/webpagetest/repeatViewRequest.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('firstViewRequestsWPT',
   'Requests Repeat View',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('firstViewRequestsWPT',
         stats.push(run.repeatView.results.requests);
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/repeatViewSpeedIndex.js b/lib/aggregators/webpagetest/repeatViewSpeedIndex.js
index 55130fde8..8e1331d68 100644
--- a/lib/aggregators/webpagetest/repeatViewSpeedIndex.js
+++ b/lib/aggregators/webpagetest/repeatViewSpeedIndex.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('repeatViewSpeedIndexWPT',
   'Speed Index Repeat View',
@@ -17,4 +17,4 @@ module.exports = new Aggregator('repeatViewSpeedIndexWPT',
         stats.push(run.repeatView.results.SpeedIndex);
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/repeatViewVisualComplete.js b/lib/aggregators/webpagetest/repeatViewVisualComplete.js
index ab35ca93e..e1ac88561 100644
--- a/lib/aggregators/webpagetest/repeatViewVisualComplete.js
+++ b/lib/aggregators/webpagetest/repeatViewVisualComplete.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('repeatViewVisualCompleteWPT',
   'Visual Complete Repeat View',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('repeatViewVisualCompleteWPT',
         stats.push(run.repeatView.results.visualComplete);
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/webpagetest/serverRTT.js b/lib/aggregators/webpagetest/serverRTT.js
index 2c8f57530..f972244f4 100644
--- a/lib/aggregators/webpagetest/serverRTT.js
+++ b/lib/aggregators/webpagetest/serverRTT.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('serverRTTWPT',
   'Estimated Server Round Trip Time', 'timing', 'milliseconds',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('serverRTTWPT',
         stats.push(run.firstView.results.server_rtt); // jshint ignore:line
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/browserScaledImages.js b/lib/aggregators/yslow/browserScaledImages.js
index 2d515acf0..2fc9fb0a1 100644
--- a/lib/aggregators/yslow/browserScaledImages.js
+++ b/lib/aggregators/yslow/browserScaledImages.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('browserScaledImages',
   'Images scaled by the browser',
@@ -18,4 +18,4 @@ module.exports = new Aggregator('browserScaledImages',
         this.stats.push(0);
       }
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/cacheTime.js b/lib/aggregators/yslow/cacheTime.js
index 15df968af..367b5df78 100644
--- a/lib/aggregators/yslow/cacheTime.js
+++ b/lib/aggregators/yslow/cacheTime.js
@@ -5,7 +5,7 @@
  * Released under the Apache 2.0 License
  */
 var util = require('../../util/yslowUtil');
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('cacheTime', 'Cache Time',
   'How long time the assets are cached in the browser. Long time is good.',
@@ -17,4 +17,4 @@ module.exports = new Aggregator('cacheTime', 'Cache Time',
         self.stats.push(util.getCacheTime(comp));
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/criticalPathScore.js b/lib/aggregators/yslow/criticalPathScore.js
index 348dfc24b..14c98f3a5 100644
--- a/lib/aggregators/yslow/criticalPathScore.js
+++ b/lib/aggregators/yslow/criticalPathScore.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('criticalPathScore',
   'Critical Rendering Path Score',
@@ -16,4 +16,4 @@ module.exports = new Aggregator('criticalPathScore',
         this.stats.push(pageData.yslow.g.criticalpath.score);
       }
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/cssImagesPerPage.js b/lib/aggregators/yslow/cssImagesPerPage.js
index 862bec8f7..55dfe9e23 100644
--- a/lib/aggregators/yslow/cssImagesPerPage.js
+++ b/lib/aggregators/yslow/cssImagesPerPage.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('cssImagesPerPage',
   'Number of CSS images per page',
@@ -18,4 +18,4 @@ module.exports = new Aggregator('cssImagesPerPage',
         this.stats.push(0);
       }
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/cssPerPage.js b/lib/aggregators/yslow/cssPerPage.js
index c0139d403..91a7aa35f 100644
--- a/lib/aggregators/yslow/cssPerPage.js
+++ b/lib/aggregators/yslow/cssPerPage.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('cssPerPage', 'Number of CSS files per page',
   'Few larger files are better when using HTTP 1.1. For HTTP 2.0 it is better with many small files from few domains.',
@@ -17,4 +17,4 @@ module.exports = new Aggregator('cssPerPage', 'Number of CSS files per page',
         this.stats.push(0);
       }
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/cssWeight.js b/lib/aggregators/yslow/cssWeight.js
index 4134ddb53..f60968572 100644
--- a/lib/aggregators/yslow/cssWeight.js
+++ b/lib/aggregators/yslow/cssWeight.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('cssWeight', 'CSS Weight',
   'The weight of CSS is important, because of mobile and networks, keep the size to a minimal.',
@@ -21,4 +21,4 @@ module.exports = new Aggregator('cssWeight', 'CSS Weight',
         }
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/cssWeightPerPage.js b/lib/aggregators/yslow/cssWeightPerPage.js
index e016f91b3..596923b07 100644
--- a/lib/aggregators/yslow/cssWeightPerPage.js
+++ b/lib/aggregators/yslow/cssWeightPerPage.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('cssWeightPerPage', 'CSS File Weight Per Page',
   'Do not download large front-end CSS farmework when you only use small parts of it.',
@@ -22,4 +22,4 @@ module.exports = new Aggregator('cssWeightPerPage', 'CSS File Weight Per Page',
       });
       this.stats.push(size);
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/docWeight.js b/lib/aggregators/yslow/docWeight.js
index b6fa7bd1b..c14b34868 100644
--- a/lib/aggregators/yslow/docWeight.js
+++ b/lib/aggregators/yslow/docWeight.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('docWeight', 'Document Weight',
   'Keep the document at a reasonable size, it will make it possible for the browser to generate the page faster.',
@@ -21,4 +21,4 @@ module.exports = new Aggregator('docWeight', 'Document Weight',
         }
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/domElements.js b/lib/aggregators/yslow/domElements.js
index 4ec580d41..e0559b97b 100644
--- a/lib/aggregators/yslow/domElements.js
+++ b/lib/aggregators/yslow/domElements.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('domElements', 'Number of DOM elements',
   'Too many DOM elements means that the page is complex and will be slower to render',
@@ -17,4 +17,4 @@ module.exports = new Aggregator('domElements', 'Number of DOM elements',
         this.stats.push(0);
       }
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/fontsPerPage.js b/lib/aggregators/yslow/fontsPerPage.js
index 8f936373f..4e323d7ad 100644
--- a/lib/aggregators/yslow/fontsPerPage.js
+++ b/lib/aggregators/yslow/fontsPerPage.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('fontsPerPage', 'Number of font files per page',
   'Few larger files are better when using HTTP 1.1. For HTTP 2.0 it is better with many small files from few domains.',
@@ -17,4 +17,4 @@ module.exports = new Aggregator('fontsPerPage', 'Number of font files per page',
         this.stats.push(0);
       }
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/imagesPerPage.js b/lib/aggregators/yslow/imagesPerPage.js
index f799622a8..b186b7690 100644
--- a/lib/aggregators/yslow/imagesPerPage.js
+++ b/lib/aggregators/yslow/imagesPerPage.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('imagesPerPage', 'Number of images per page',
   'Avoid too many images because it will take time for them all to load.',
@@ -17,4 +17,4 @@ module.exports = new Aggregator('imagesPerPage', 'Number of images per page',
         this.stats.push(0);
       }
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/imagesWeight.js b/lib/aggregators/yslow/imagesWeight.js
index 073916656..dfdac803a 100644
--- a/lib/aggregators/yslow/imagesWeight.js
+++ b/lib/aggregators/yslow/imagesWeight.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('imageWeight', 'Image Weight',
   'The weight of images is important, are usually 60-70% of the total page weight ',
@@ -21,4 +21,4 @@ module.exports = new Aggregator('imageWeight', 'Image Weight',
         }
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/imagesWeightPerPage.js b/lib/aggregators/yslow/imagesWeightPerPage.js
index 38af8a473..de5e6b0d8 100644
--- a/lib/aggregators/yslow/imagesWeightPerPage.js
+++ b/lib/aggregators/yslow/imagesWeightPerPage.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('imagesWeightPerPage', 'Images Weight Per Page',
   'Image weight are the largest part of a web page. Make sure they are compressed and as small as possible.',
@@ -22,4 +22,4 @@ module.exports = new Aggregator('imagesWeightPerPage', 'Images Weight Per Page',
       });
       this.stats.push(size);
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/jsPerPage.js b/lib/aggregators/yslow/jsPerPage.js
index abca55f39..a509edf47 100644
--- a/lib/aggregators/yslow/jsPerPage.js
+++ b/lib/aggregators/yslow/jsPerPage.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('jsPerPage', 'Number of JS files per page',
   'Few larger files are better when using HTTP 1.1. For HTTP 2.0 it is better with many small files from few domains.',
@@ -17,4 +17,4 @@ module.exports = new Aggregator('jsPerPage', 'Number of JS files per page',
         this.stats.push(0);
       }
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/jsSyncInHead.js b/lib/aggregators/yslow/jsSyncInHead.js
index d57d12f95..7597ec2c5 100644
--- a/lib/aggregators/yslow/jsSyncInHead.js
+++ b/lib/aggregators/yslow/jsSyncInHead.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('jsSyncInHead',
   'Number of JS synchronously inside head',
@@ -18,4 +18,4 @@ module.exports = new Aggregator('jsSyncInHead',
         this.stats.push(0);
       }
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/jsWeight.js b/lib/aggregators/yslow/jsWeight.js
index bc2b4304b..f88df9b17 100644
--- a/lib/aggregators/yslow/jsWeight.js
+++ b/lib/aggregators/yslow/jsWeight.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('jsWeight', 'JS Weight',
   'The weight of javascripts is important, because of mobile and networks, keep the size to a minimal.',
@@ -21,4 +21,4 @@ module.exports = new Aggregator('jsWeight', 'JS Weight',
         }
       });
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/jsWeightPerPage.js b/lib/aggregators/yslow/jsWeightPerPage.js
index 99abf76ba..a78ba4be1 100644
--- a/lib/aggregators/yslow/jsWeightPerPage.js
+++ b/lib/aggregators/yslow/jsWeightPerPage.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('jsWeightPerPage', 'JS File Weight Per Page',
   'Don\'t download large Javascript libraries when you only use small parts of it.',
@@ -22,4 +22,4 @@ module.exports = new Aggregator('jsWeightPerPage', 'JS File Weight Per Page',
       });
       this.stats.push(size);
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/maxRequestsPerHost.js b/lib/aggregators/yslow/maxRequestsPerHost.js
index 2a1887833..eb02da5dd 100644
--- a/lib/aggregators/yslow/maxRequestsPerHost.js
+++ b/lib/aggregators/yslow/maxRequestsPerHost.js
@@ -5,7 +5,7 @@
  * Released under the Apache 2.0 License
  */
 var util = require('../../util/yslowUtil');
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('maxRequestsPerHost', 'Max requests per domain',
   'Using HTTP 1.1 you want to avoid loading too many assets from one domain',
@@ -24,4 +24,4 @@ module.exports = new Aggregator('maxRequestsPerHost', 'Max requests per domain',
       }
       this.stats.push(maxRequestsPerHost);
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/noduplicates.js b/lib/aggregators/yslow/noduplicates.js
index b958f5ff8..d1b66681c 100644
--- a/lib/aggregators/yslow/noduplicates.js
+++ b/lib/aggregators/yslow/noduplicates.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('noDuplicates', 'Remove duplicate JS and CSS',
   'It is bad practice include the same js or css twice since browsers will execute the code each toim',
@@ -18,4 +18,4 @@ module.exports = new Aggregator('noDuplicates', 'Remove duplicate JS and CSS',
       }
     }
 
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/numberOfDomains.js b/lib/aggregators/yslow/numberOfDomains.js
index d973ae13f..8dc1425e2 100644
--- a/lib/aggregators/yslow/numberOfDomains.js
+++ b/lib/aggregators/yslow/numberOfDomains.js
@@ -5,7 +5,7 @@
  * Released under the Apache 2.0 License
  */
 var util = require('../../util/yslowUtil');
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('numberOfDomains', 'Number Of Domains',
   'Many domains means many DNS lookups and that means slower pages.',
@@ -14,4 +14,4 @@ module.exports = new Aggregator('numberOfDomains', 'Number Of Domains',
     if (pageData.yslow) {
       this.stats.push(util.getNumberOfDomains(pageData.yslow.comps));
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/pageWeight.js b/lib/aggregators/yslow/pageWeight.js
index 2388c0ad5..1ecf782ac 100644
--- a/lib/aggregators/yslow/pageWeight.js
+++ b/lib/aggregators/yslow/pageWeight.js
@@ -5,7 +5,7 @@
  * Released under the Apache 2.0 License
  */
 var util = require('../../util/yslowUtil');
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('pageWeight',
   'Total page weight (including all assets)',
@@ -15,4 +15,4 @@ module.exports = new Aggregator('pageWeight',
     if (pageData.yslow) {
       this.stats.push(util.getSize(pageData.yslow.comps));
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/pagesWithSPOF.js b/lib/aggregators/yslow/pagesWithSPOF.js
index 69fc714dd..bbc5daa21 100644
--- a/lib/aggregators/yslow/pagesWithSPOF.js
+++ b/lib/aggregators/yslow/pagesWithSPOF.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('pagesWithSPOF', 'Pages with SPOF',
   'How many pages have a single point of failures (meaning if someone elses API/site is broken, it will break your page.',
@@ -17,4 +17,4 @@ module.exports = new Aggregator('pagesWithSPOF', 'Pages with SPOF',
         this.stats.push(0);
       }
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/redirectsPerPage.js b/lib/aggregators/yslow/redirectsPerPage.js
index 3c9ec22a3..c10732d69 100644
--- a/lib/aggregators/yslow/redirectsPerPage.js
+++ b/lib/aggregators/yslow/redirectsPerPage.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('redirectsPerPage', 'Redirects Per Page',
   'Avoid doing redirects, it will slow down the page!',
diff --git a/lib/aggregators/yslow/requests.js b/lib/aggregators/yslow/requests.js
index 5862d2b3a..02e08b7ec 100644
--- a/lib/aggregators/yslow/requests.js
+++ b/lib/aggregators/yslow/requests.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('requests', 'Number of requests per page',
   'Fewer requests are always faster than many requests.',
@@ -13,4 +13,4 @@ module.exports = new Aggregator('requests', 'Number of requests per page',
     if (pageData.yslow) {
       this.stats.push(pageData.yslow.r);
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/requestsWithoutExpires.js b/lib/aggregators/yslow/requestsWithoutExpires.js
index 57550ad73..9c59916c9 100644
--- a/lib/aggregators/yslow/requestsWithoutExpires.js
+++ b/lib/aggregators/yslow/requestsWithoutExpires.js
@@ -5,7 +5,7 @@
  * Released under the Apache 2.0 License
  */
 var util = require('../../util/yslowUtil');
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('requestsWithoutExpires',
   'Requests Without Expires',
@@ -21,4 +21,4 @@ module.exports = new Aggregator('requestsWithoutExpires',
       });
       this.stats.push(requestsWithoutExpire);
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/requestsWithoutGzip.js b/lib/aggregators/yslow/requestsWithoutGzip.js
index 3b0ff17b8..1d0b445a3 100644
--- a/lib/aggregators/yslow/requestsWithoutGzip.js
+++ b/lib/aggregators/yslow/requestsWithoutGzip.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('requestsWithoutGzip', 'Requests without GZip',
   'All text content (JS/CSS/HTML) can and should be sent GZiped so that the size is as small as possible.',
@@ -18,4 +18,4 @@ module.exports = new Aggregator('requestsWithoutGzip', 'Requests without GZip',
       }
     }
 
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/ruleScore.js b/lib/aggregators/yslow/ruleScore.js
index 39aaa9c26..9027c085d 100644
--- a/lib/aggregators/yslow/ruleScore.js
+++ b/lib/aggregators/yslow/ruleScore.js
@@ -1,4 +1,4 @@
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('ruleScore', 'Rule Score',
   'The sitespeed.io total rule score for all the pages',
@@ -7,4 +7,4 @@ module.exports = new Aggregator('ruleScore', 'Rule Score',
     if (pageData.yslow) {
       this.stats.push(pageData.yslow.o);
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/singleDomainRequests.js b/lib/aggregators/yslow/singleDomainRequests.js
index cb2602930..7d30b901c 100644
--- a/lib/aggregators/yslow/singleDomainRequests.js
+++ b/lib/aggregators/yslow/singleDomainRequests.js
@@ -5,7 +5,7 @@
  * Released under the Apache 2.0 License
  */
 var util = require('../../util/yslowUtil');
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('singleDomainRequests', 'Domains with only one request',
   'Many domains means many DNS lookups and that means slower pages. Only loading one request for one domain is wasteful.',
@@ -24,4 +24,4 @@ module.exports = new Aggregator('singleDomainRequests', 'Domains with only one r
       }
       this.stats.push(domainsWithOneRequest);
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/spofPerPage.js b/lib/aggregators/yslow/spofPerPage.js
index 191266d3a..bf3e11b58 100644
--- a/lib/aggregators/yslow/spofPerPage.js
+++ b/lib/aggregators/yslow/spofPerPage.js
@@ -4,7 +4,7 @@
  * and other contributors
  * Released under the Apache 2.0 License
  */
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('spofPerPage',
   'Number of SPOF per page',
@@ -18,4 +18,4 @@ module.exports = new Aggregator('spofPerPage',
         this.stats.push(0);
       }
     }
-  });
\ No newline at end of file
+  });
diff --git a/lib/aggregators/yslow/timeSinceLastMod.js b/lib/aggregators/yslow/timeSinceLastMod.js
index 57ec2690d..98b1ca7fc 100644
--- a/lib/aggregators/yslow/timeSinceLastMod.js
+++ b/lib/aggregators/yslow/timeSinceLastMod.js
@@ -5,7 +5,7 @@
  * Released under the Apache 2.0 License
  */
 var util = require('../../util/yslowUtil');
-var Aggregator = require('../../aggregator');
+var Aggregator = require('../aggregator');
 
 module.exports = new Aggregator('timeSinceLastMod',
   'Time since last modification',
@@ -18,4 +18,4 @@ module.exports = new Aggregator('timeSinceLastMod',
         self.stats.push(util.getTimeSinceLastMod(comp));
       });
     }
-  });
\ No newline at end of file
+  });