diff --git a/esbo_etc/lib/SpinnerHandler.py b/esbo_etc/classes/SpinnerHandler.py
similarity index 100%
rename from esbo_etc/lib/SpinnerHandler.py
rename to esbo_etc/classes/SpinnerHandler.py
diff --git a/esbo_etc/classes/__init__.py b/esbo_etc/classes/__init__.py
index 6a949d4..4ae0f0f 100644
--- a/esbo_etc/classes/__init__.py
+++ b/esbo_etc/classes/__init__.py
@@ -6,3 +6,4 @@ from .optical_component import *
 from .RadiantFactory import *
 from .sensor import *
 from .psf import *
+from.SpinnerHandler import *
diff --git a/esbo_etc/lib/__init__.py b/esbo_etc/lib/__init__.py
index 2307687..7550af5 100644
--- a/esbo_etc/lib/__init__.py
+++ b/esbo_etc/lib/__init__.py
@@ -1,3 +1,2 @@
 from .helpers import *
 from .output import *
-from .SpinnerHandler import *