diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index fe2bf80f..3dba09a6 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -3,7 +3,7 @@ imports:
 - php
 
 filter:
-  excluded_paths: [lib/*,ext/tagger/script.js,ext/chatbox/*]
+  excluded_paths: [lib/*,ext/*/lib/*,ext/tagger/script.js,ext/chatbox/*]
 
 tools:
   external_code_coverage: true
diff --git a/ext/amazon_s3/S3.php b/ext/amazon_s3/lib/S3.php
similarity index 100%
rename from ext/amazon_s3/S3.php
rename to ext/amazon_s3/lib/S3.php
diff --git a/ext/amazon_s3/main.php b/ext/amazon_s3/main.php
index ff797faa..a0fda3a4 100644
--- a/ext/amazon_s3/main.php
+++ b/ext/amazon_s3/main.php
@@ -7,7 +7,7 @@
  * Documentation:
  */
 
-require_once "ext/amazon_s3/S3.php";
+require_once "ext/amazon_s3/lib/S3.php";
 
 class UploadS3 extends Extension {
 	public function onInitExt(InitExtEvent $event) {