diff --git a/app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java b/app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java
index 0584afb..36e3b94 100644
--- a/app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java
+++ b/app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java
@@ -91,84 +91,6 @@ public class DetectorService extends LifecycleService {
     }
 
 
-    /** Video Detection */
-    public void startVideoDetection() {
-        if(videoDetector != null)
-            videoDetector.startDetection();
-    }
-    public void stopVideoDetection() {
-        if(videoDetector != null)
-            videoDetector.stopDetection();
-    }
-    public boolean isVideoDetectionRunning() {
-        if(videoDetector != null)
-           return videoDetector.isDetecting();
-        return false;
-    }
-    public void debugVideoProcessing(ImageView input, ImageView output) {
-        if(videoDetector != null)
-            videoDetector.debugProcessing(input, output);
-    }
-
-    /** Audio Detection */
-    public void startAudioDetection() {
-        if(audioDetector != null)
-            audioDetector.startDetection();
-    }
-    public void stopAudioDetection() {
-        if(audioDetector != null)
-            audioDetector.stopDetection();
-    }
-
-    /** Motion Detection */
-    public void startMotionDetection() {
-        if(motionDetector != null)
-            motionDetector.startDetection();
-    }
-    public void stopMotionDetection() {
-        if(motionDetector != null)
-            motionDetector.stopDetection();
-    }
-
-    /** Video Recording */
-    public void startVideoRecording() {
-        if(videoDetector != null)
-            videoDetector.startRecording();
-    }
-    public void stopVideoRecording() {
-        if(videoDetector != null)
-            videoDetector.stopRecording();
-    }
-    public boolean isVideoRecordingRunning() {
-        if(videoDetector != null)
-            return videoDetector.isRecording();
-        return false;
-    }
-    public void setVideoRecordingDir(File outputDir) {
-        if (videoDetector != null)
-            videoDetector.setOutputDir(outputDir);
-    }
-
-    /** Audio Recording */
-    public void startAudioRecording() {
-        if(audioRecorder != null)
-            audioRecorder.startRecording();
-    }
-    public void stopAudioRecording() {
-        if(audioRecorder != null)
-            audioRecorder.stopRecording();
-    }
-    public boolean isAudioRecordingRunning() {
-        if(videoDetector != null)
-            return audioRecorder.isRecording();
-        return false;
-    }
-    public void setAudioRecordingDir(File outputDir) {
-        if (audioRecorder != null)
-            audioRecorder.setOutputDir(outputDir);
-    }
-
-
     /** Pass Detection Report to Service Detection Listener and trigger it */
     public void passToServiceListener(DetectionReport detectionReport) {
         if (listener != null) {
diff --git a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java b/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
index a083b0e..8766d85 100644
--- a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
+++ b/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
@@ -60,21 +60,28 @@ public class MainActivity extends AppCompatActivity {
                     {
                         if (detectorService != null){
 
-                            detectorService.debugVideoProcessing(inputImageView, outputImageView);
-                            detectorService.startVideoDetection();
-                            detectorService.startAudioDetection();
-                            detectorService.startMotionDetection();
-                            detectorService.startVideoRecording();
-                            detectorService.startAudioRecording();
+                            detectorService.videoDetector.debugProcessing(inputImageView, outputImageView);
+                            detectorService.videoDetector.startDetection();
 
+                            detectorService.audioDetector.startDetection();
+
+                            detectorService.motionDetector.startDetection();
+
+                            detectorService.audioRecorder.stopRecording();
+
+                            detectorService.videoDetector.startRecording();
                         }
                     }
                     else {
-                        detectorService.stopVideoDetection();
-                        detectorService.stopAudioDetection();
-                        detectorService.stopMotionDetection();
-                        detectorService.stopVideoRecording();
-                        detectorService.stopAudioRecording();
+                        detectorService.videoDetector.stopDetection();
+
+                        detectorService.audioDetector.stopDetection();
+
+                        detectorService.motionDetector.stopDetection();
+
+                        detectorService.audioRecorder.stopRecording();
+
+                        detectorService.videoDetector.stopRecording();
                     }
                 }
             });