diff --git a/src/LinkClickScrollHandler/initializeOnLinkClickScroll.ts b/src/handlers/linkClickScroll/initializeOnLinkClickScroll.ts
similarity index 77%
rename from src/LinkClickScrollHandler/initializeOnLinkClickScroll.ts
rename to src/handlers/linkClickScroll/initializeOnLinkClickScroll.ts
index 7459d5b5cc15e64cdc40ae718409e9b78b9b9993..49d2cfdf5b675b645ccfca6ec31dbc6f40dcf60d 100644
--- a/src/LinkClickScrollHandler/initializeOnLinkClickScroll.ts
+++ b/src/handlers/linkClickScroll/initializeOnLinkClickScroll.ts
@@ -1,6 +1,6 @@
-import {scrollToTarget} from '../scrollers/scrollToTarget';
-import {assert} from '../assert';
-import {HashTarget} from '../HashTarget';
+import {scrollToTarget} from '../../scrollers/scrollToTarget';
+import {assert} from '../../assert';
+import {HashTarget} from '../../HashTarget';
 
 export function initializeOnLinkClickScroll(): void
 {
diff --git a/src/LinkClickScrollHandler/unitTest.html b/src/handlers/linkClickScroll/unitTest.html
similarity index 99%
rename from src/LinkClickScrollHandler/unitTest.html
rename to src/handlers/linkClickScroll/unitTest.html
index a0d652675d4cc5b203138ff1f921cc2916b08bca..c53bbe8ff75c53b4cf07650a53f36efc6cc390b5 100644
--- a/src/LinkClickScrollHandler/unitTest.html
+++ b/src/handlers/linkClickScroll/unitTest.html
@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<title>Link click scroll test</title>
 	<script src="https://cdn.jsdelivr.net/npm/velocity-animate@1.5/velocity.min.js"></script>
-	<script src="../../dist/index.js"></script>
+	<script src="../../../dist/index.js"></script>
 	<script>
 		SmoothScroll.enable({
 			scrollOnLoad: false,
diff --git a/src/LoadScrollHandler/initializeOnLoadScroll.ts b/src/handlers/loadScroll/initializeOnLoadScroll.ts
similarity index 90%
rename from src/LoadScrollHandler/initializeOnLoadScroll.ts
rename to src/handlers/loadScroll/initializeOnLoadScroll.ts
index 86197f4e4ed53cd9c0ce2d1c6adce995775950d6..63bb0a3f14a96a0ae180780bc1234b2a3789f1c2 100644
--- a/src/LoadScrollHandler/initializeOnLoadScroll.ts
+++ b/src/handlers/loadScroll/initializeOnLoadScroll.ts
@@ -1,6 +1,6 @@
-import {scrollToTarget} from '../scrollers/scrollToTarget';
-import {HashTarget} from '../HashTarget';
-import {assert} from '../assert';
+import {scrollToTarget} from '../../scrollers/scrollToTarget';
+import {HashTarget} from '../../HashTarget';
+import {assert} from '../../assert';
 
 /**
  * Scrolls smoothly to an element if there is a hash in the URL.
diff --git a/src/LoadScrollHandler/unitTest.html b/src/handlers/loadScroll/unitTest.html
similarity index 99%
rename from src/LoadScrollHandler/unitTest.html
rename to src/handlers/loadScroll/unitTest.html
index c19a7a627523322ce531dafc4bdc9010877759f9..5877c499aaa2424f8e19321776817e99dcc870a1 100644
--- a/src/LoadScrollHandler/unitTest.html
+++ b/src/handlers/loadScroll/unitTest.html
@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<title>Load scroll test</title>
 	<script src="https://cdn.jsdelivr.net/npm/velocity-animate@1.5/velocity.min.js"></script>
-	<script src="../../dist/index.js"></script>
+	<script src="../../../dist/index.js"></script>
 	<script>
 		SmoothScroll.enable({
 			scrollOnLoad: true,
diff --git a/src/index.ts b/src/index.ts
index 37b73afd27bc84aedd53595ed48318ac4bb4ab65..134ba664c8d610fb7ab8ba69713cf08baf7495b1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,7 +1,7 @@
 import * as Velocity from 'velocity-animate';
 import setupVelocity from './easing/setupVelocity';
-import {initializeOnLoadScroll} from './LoadScrollHandler/initializeOnLoadScroll';
-import {initializeOnLinkClickScroll} from './LinkClickScrollHandler/initializeOnLinkClickScroll';
+import {initializeOnLoadScroll} from './handlers/loadScroll/initializeOnLoadScroll';
+import {initializeOnLinkClickScroll} from './handlers/linkClickScroll/initializeOnLinkClickScroll';
 
 export interface SmoothScrollOptions {
 	readonly scrollOnLoad?: boolean;