diff --git a/spotdl/encode/__init__.py b/spotdl/encode/__init__.py
new file mode 100644
index 0000000..04bd812
--- /dev/null
+++ b/spotdl/encode/__init__.py
@@ -0,0 +1 @@
+from spotdl.encode.encode_base import EncoderBase
diff --git a/spotdl/encoders/base.py b/spotdl/encode/encode_base.py
similarity index 93%
rename from spotdl/encoders/base.py
rename to spotdl/encode/encode_base.py
index 8f13df3..9c111dd 100644
--- a/spotdl/encoders/base.py
+++ b/spotdl/encode/encode_base.py
@@ -1,9 +1,8 @@
-from abc import ABCMeta
-from abc import abstractmethod
-from abc import abstractproperty
-
 import os
 
+from abc import ABC
+from abc import abstractmethod
+
 """
   NOTE ON ENCODERS
   ================
@@ -22,7 +21,8 @@ import os
 
 """
 
-class EncoderBase(metaclass=ABCMeta):
+
+class EncoderBase(ABC):
     @abstractmethod
     def __init__(self, encoder_path, loglevel, additional_arguments):
         self.encoder_path = encoder_path
diff --git a/spotdl/encode/encoders/__init__.py b/spotdl/encode/encoders/__init__.py
new file mode 100644
index 0000000..bb7a838
--- /dev/null
+++ b/spotdl/encode/encoders/__init__.py
@@ -0,0 +1,4 @@
+from spotdl.encode.encoders.ffmpeg import EncoderFFmpeg
+from spotdl.encode.encoders.avconv import EncoderAvconv
+
+EncodeClasses = (EncoderFFmpeg, EncoderAvconv)
diff --git a/spotdl/encoders/avconv.py b/spotdl/encode/encoders/avconv.py
similarity index 98%
rename from spotdl/encoders/avconv.py
rename to spotdl/encode/encoders/avconv.py
index 239daa6..d94d84e 100644
--- a/spotdl/encoders/avconv.py
+++ b/spotdl/encode/encoders/avconv.py
@@ -1,7 +1,7 @@
 import subprocess
 import os
 from logzero import logger as log
-from spotdl.encoders import EncoderBase
+from spotdl.encode import EncoderBase
 
 class EncoderAvconv(EncoderBase):
     def __init__(self, encoder_path="avconv"):
diff --git a/spotdl/encoders/ffmpeg.py b/spotdl/encode/encoders/ffmpeg.py
similarity index 98%
rename from spotdl/encoders/ffmpeg.py
rename to spotdl/encode/encoders/ffmpeg.py
index 2e70d95..31dabc5 100644
--- a/spotdl/encoders/ffmpeg.py
+++ b/spotdl/encode/encoders/ffmpeg.py
@@ -1,7 +1,7 @@
 import subprocess
 import os
 from logzero import logger as log
-from spotdl.encoders import EncoderBase
+from spotdl.encode import EncoderBase
 
 RULES = {
     "m4a": {
diff --git a/spotdl/encoders/__init__.py b/spotdl/encoders/__init__.py
deleted file mode 100644
index cd8d70c..0000000
--- a/spotdl/encoders/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from spotdl.encoders.base import EncoderBase
-from spotdl.encoders.ffmpeg import EncoderFFmpeg
-from spotdl.encoders.avconv import EncoderAvconv