diff --git a/Makefile b/Makefile
index ba8fdbc..3cd3957 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ DOMAIN   := schneegans.github.com
 ZIP_NAME := $(NAME)@$(DOMAIN).zip
 
 # Some of the recipes below depend on some of these files.
-JS_FILES       = $(wildcard src/*.js extension.js prefs.js)
+JS_FILES       = $(wildcard src/*.js src/*/*.js extension.js prefs.js)
 UI_FILES       = $(shell find resources -type f -and \( -name "*.ui" \))
 RESOURCE_FILES = $(shell find resources -mindepth 2 -type f)
 LOCALES_PO     = $(wildcard po/*.po)
diff --git a/docs/how-to-create-new-effects.md b/docs/how-to-create-new-effects.md
index 24b923f..c30da07 100644
--- a/docs/how-to-create-new-effects.md
+++ b/docs/how-to-create-new-effects.md
@@ -78,7 +78,7 @@ Just remember to replace `simple-fade` with your custom name!
 
 ### 2. Creating the Effect Class
 
-You will have to create a new GLSL file called `resources/shaders/simple-fade.frag` and a new JavaScript source file called `src/SimpleFade.js`.
+You will have to create a new GLSL file called `resources/shaders/simple-fade.frag` and a new JavaScript source file called `src/effects/SimpleFade.js`.
 Simply paste the following source code to the respective file.
 Please study this code carefully, all of it is explained with inline comments.
 
@@ -239,7 +239,7 @@ Like this:
 ```javascript
 const ALL_EFFECTS = [
   ...
-  new Me.imports.src.SimpleFade.SimpleFade(),
+  new Me.imports.src.effects.SimpleFade.SimpleFade(),
   ...
 ];
 ```
diff --git a/extension.js b/extension.js
index d1697a7..1660712 100644
--- a/extension.js
+++ b/extension.js
@@ -51,26 +51,26 @@ class Extension {
 
     // New effects must be registered here and in prefs.js.
     this._ALL_EFFECTS = [
-      new Me.imports.src.Apparition.Apparition(),
-      new Me.imports.src.BrokenGlass.BrokenGlass(),
-      new Me.imports.src.Doom.Doom(),
-      new Me.imports.src.EnergizeA.EnergizeA(),
-      new Me.imports.src.EnergizeB.EnergizeB(),
-      new Me.imports.src.Fire.Fire(),
-      new Me.imports.src.Glide.Glide(),
-      new Me.imports.src.Glitch.Glitch(),
-      new Me.imports.src.Hexagon.Hexagon(),
-      new Me.imports.src.Incinerate.Incinerate(),
-      new Me.imports.src.Matrix.Matrix(),
-      new Me.imports.src.Pixelate.Pixelate(),
-      new Me.imports.src.PixelWheel.PixelWheel(),
-      new Me.imports.src.PixelWipe.PixelWipe(),
-      new Me.imports.src.Portal.Portal(),
-      new Me.imports.src.SnapOfDisintegration.SnapOfDisintegration(),
-      new Me.imports.src.TRexAttack.TRexAttack(),
-      new Me.imports.src.TVEffect.TVEffect(),
-      new Me.imports.src.TVGlitch.TVGlitch(),
-      new Me.imports.src.Wisps.Wisps(),
+      new Me.imports.src.effects.Apparition.Apparition(),
+      new Me.imports.src.effects.BrokenGlass.BrokenGlass(),
+      new Me.imports.src.effects.Doom.Doom(),
+      new Me.imports.src.effects.EnergizeA.EnergizeA(),
+      new Me.imports.src.effects.EnergizeB.EnergizeB(),
+      new Me.imports.src.effects.Fire.Fire(),
+      new Me.imports.src.effects.Glide.Glide(),
+      new Me.imports.src.effects.Glitch.Glitch(),
+      new Me.imports.src.effects.Hexagon.Hexagon(),
+      new Me.imports.src.effects.Incinerate.Incinerate(),
+      new Me.imports.src.effects.Matrix.Matrix(),
+      new Me.imports.src.effects.Pixelate.Pixelate(),
+      new Me.imports.src.effects.PixelWheel.PixelWheel(),
+      new Me.imports.src.effects.PixelWipe.PixelWipe(),
+      new Me.imports.src.effects.Portal.Portal(),
+      new Me.imports.src.effects.SnapOfDisintegration.SnapOfDisintegration(),
+      new Me.imports.src.effects.TRexAttack.TRexAttack(),
+      new Me.imports.src.effects.TVEffect.TVEffect(),
+      new Me.imports.src.effects.TVGlitch.TVGlitch(),
+      new Me.imports.src.effects.Wisps.Wisps(),
     ];
 
     // Load all of our resources.
diff --git a/prefs.js b/prefs.js
index 7154ce5..98881bf 100644
--- a/prefs.js
+++ b/prefs.js
@@ -48,26 +48,26 @@ var PreferencesDialog = class PreferencesDialog {
 
     // New effects must be registered here and in extension.js.
     this._ALL_EFFECTS = [
-      new Me.imports.src.Apparition.Apparition(),
-      new Me.imports.src.BrokenGlass.BrokenGlass(),
-      new Me.imports.src.Doom.Doom(),
-      new Me.imports.src.EnergizeA.EnergizeA(),
-      new Me.imports.src.EnergizeB.EnergizeB(),
-      new Me.imports.src.Fire.Fire(),
-      new Me.imports.src.Glide.Glide(),
-      new Me.imports.src.Glitch.Glitch(),
-      new Me.imports.src.Hexagon.Hexagon(),
-      new Me.imports.src.Incinerate.Incinerate(),
-      new Me.imports.src.Matrix.Matrix(),
-      new Me.imports.src.Pixelate.Pixelate(),
-      new Me.imports.src.PixelWheel.PixelWheel(),
-      new Me.imports.src.PixelWipe.PixelWipe(),
-      new Me.imports.src.Portal.Portal(),
-      new Me.imports.src.SnapOfDisintegration.SnapOfDisintegration(),
-      new Me.imports.src.TRexAttack.TRexAttack(),
-      new Me.imports.src.TVEffect.TVEffect(),
-      new Me.imports.src.TVGlitch.TVGlitch(),
-      new Me.imports.src.Wisps.Wisps(),
+      new Me.imports.src.effects.Apparition.Apparition(),
+      new Me.imports.src.effects.BrokenGlass.BrokenGlass(),
+      new Me.imports.src.effects.Doom.Doom(),
+      new Me.imports.src.effects.EnergizeA.EnergizeA(),
+      new Me.imports.src.effects.EnergizeB.EnergizeB(),
+      new Me.imports.src.effects.Fire.Fire(),
+      new Me.imports.src.effects.Glide.Glide(),
+      new Me.imports.src.effects.Glitch.Glitch(),
+      new Me.imports.src.effects.Hexagon.Hexagon(),
+      new Me.imports.src.effects.Incinerate.Incinerate(),
+      new Me.imports.src.effects.Matrix.Matrix(),
+      new Me.imports.src.effects.Pixelate.Pixelate(),
+      new Me.imports.src.effects.PixelWheel.PixelWheel(),
+      new Me.imports.src.effects.PixelWipe.PixelWipe(),
+      new Me.imports.src.effects.Portal.Portal(),
+      new Me.imports.src.effects.SnapOfDisintegration.SnapOfDisintegration(),
+      new Me.imports.src.effects.TRexAttack.TRexAttack(),
+      new Me.imports.src.effects.TVEffect.TVEffect(),
+      new Me.imports.src.effects.TVGlitch.TVGlitch(),
+      new Me.imports.src.effects.Wisps.Wisps(),
     ];
 
     // Load all of our resources.
diff --git a/src/Apparition.js b/src/effects/Apparition.js
similarity index 100%
rename from src/Apparition.js
rename to src/effects/Apparition.js
diff --git a/src/BrokenGlass.js b/src/effects/BrokenGlass.js
similarity index 100%
rename from src/BrokenGlass.js
rename to src/effects/BrokenGlass.js
diff --git a/src/Doom.js b/src/effects/Doom.js
similarity index 100%
rename from src/Doom.js
rename to src/effects/Doom.js
diff --git a/src/EnergizeA.js b/src/effects/EnergizeA.js
similarity index 100%
rename from src/EnergizeA.js
rename to src/effects/EnergizeA.js
diff --git a/src/EnergizeB.js b/src/effects/EnergizeB.js
similarity index 100%
rename from src/EnergizeB.js
rename to src/effects/EnergizeB.js
diff --git a/src/Fire.js b/src/effects/Fire.js
similarity index 100%
rename from src/Fire.js
rename to src/effects/Fire.js
diff --git a/src/Glide.js b/src/effects/Glide.js
similarity index 100%
rename from src/Glide.js
rename to src/effects/Glide.js
diff --git a/src/Glitch.js b/src/effects/Glitch.js
similarity index 100%
rename from src/Glitch.js
rename to src/effects/Glitch.js
diff --git a/src/Hexagon.js b/src/effects/Hexagon.js
similarity index 100%
rename from src/Hexagon.js
rename to src/effects/Hexagon.js
diff --git a/src/Incinerate.js b/src/effects/Incinerate.js
similarity index 100%
rename from src/Incinerate.js
rename to src/effects/Incinerate.js
diff --git a/src/Matrix.js b/src/effects/Matrix.js
similarity index 100%
rename from src/Matrix.js
rename to src/effects/Matrix.js
diff --git a/src/PixelWheel.js b/src/effects/PixelWheel.js
similarity index 100%
rename from src/PixelWheel.js
rename to src/effects/PixelWheel.js
diff --git a/src/PixelWipe.js b/src/effects/PixelWipe.js
similarity index 100%
rename from src/PixelWipe.js
rename to src/effects/PixelWipe.js
diff --git a/src/Pixelate.js b/src/effects/Pixelate.js
similarity index 100%
rename from src/Pixelate.js
rename to src/effects/Pixelate.js
diff --git a/src/Portal.js b/src/effects/Portal.js
similarity index 100%
rename from src/Portal.js
rename to src/effects/Portal.js
diff --git a/src/SnapOfDisintegration.js b/src/effects/SnapOfDisintegration.js
similarity index 100%
rename from src/SnapOfDisintegration.js
rename to src/effects/SnapOfDisintegration.js
diff --git a/src/TRexAttack.js b/src/effects/TRexAttack.js
similarity index 100%
rename from src/TRexAttack.js
rename to src/effects/TRexAttack.js
diff --git a/src/TVEffect.js b/src/effects/TVEffect.js
similarity index 100%
rename from src/TVEffect.js
rename to src/effects/TVEffect.js
diff --git a/src/TVGlitch.js b/src/effects/TVGlitch.js
similarity index 100%
rename from src/TVGlitch.js
rename to src/effects/TVGlitch.js
diff --git a/src/Wisps.js b/src/effects/Wisps.js
similarity index 100%
rename from src/Wisps.js
rename to src/effects/Wisps.js