diff --git a/server/build_without_gradle.sh b/server/build_without_gradle.sh
index 845b0104..6dc547d9 100755
--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@@ -52,6 +52,11 @@ cd "$SERVER_DIR/src/main/aidl"
 
 SRC=( \
     com/genymobile/scrcpy/*.java \
+    com/genymobile/scrcpy/audio/*.java \
+    com/genymobile/scrcpy/control/*.java \
+    com/genymobile/scrcpy/device/*.java \
+    com/genymobile/scrcpy/util/*.java \
+    com/genymobile/scrcpy/video/*.java \
     com/genymobile/scrcpy/wrappers/*.java \
 )
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
index f9b1efd6..1b8d4248 100644
--- a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
@@ -1,5 +1,10 @@
 package com.genymobile.scrcpy;
 
+import com.genymobile.scrcpy.device.Device;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.util.Settings;
+import com.genymobile.scrcpy.util.SettingsException;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/server/src/main/java/com/genymobile/scrcpy/Options.java b/server/src/main/java/com/genymobile/scrcpy/Options.java
index 9b1d8d8d..143fbb9a 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -1,5 +1,15 @@
 package com.genymobile.scrcpy;
 
+import com.genymobile.scrcpy.audio.AudioCodec;
+import com.genymobile.scrcpy.audio.AudioSource;
+import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.util.CodecOption;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.video.CameraAspectRatio;
+import com.genymobile.scrcpy.video.CameraFacing;
+import com.genymobile.scrcpy.video.VideoCodec;
+import com.genymobile.scrcpy.video.VideoSource;
+
 import android.graphics.Rect;
 
 import java.util.List;
diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.java
index 587a46df..263c784d 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -1,5 +1,26 @@
 package com.genymobile.scrcpy;
 
+import com.genymobile.scrcpy.audio.AudioCapture;
+import com.genymobile.scrcpy.audio.AudioCodec;
+import com.genymobile.scrcpy.audio.AudioEncoder;
+import com.genymobile.scrcpy.audio.AudioRawRecorder;
+import com.genymobile.scrcpy.control.ControlChannel;
+import com.genymobile.scrcpy.control.Controller;
+import com.genymobile.scrcpy.control.DeviceMessage;
+import com.genymobile.scrcpy.device.ConfigurationException;
+import com.genymobile.scrcpy.device.DesktopConnection;
+import com.genymobile.scrcpy.device.Device;
+import com.genymobile.scrcpy.device.Streamer;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.util.LogUtils;
+import com.genymobile.scrcpy.util.Settings;
+import com.genymobile.scrcpy.util.SettingsException;
+import com.genymobile.scrcpy.video.CameraCapture;
+import com.genymobile.scrcpy.video.ScreenCapture;
+import com.genymobile.scrcpy.video.SurfaceCapture;
+import com.genymobile.scrcpy.video.SurfaceEncoder;
+import com.genymobile.scrcpy.video.VideoSource;
+
 import android.os.BatteryManager;
 import android.os.Build;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java b/server/src/main/java/com/genymobile/scrcpy/Workarounds.java
index c9a26d78..8b8b4233 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Workarounds.java
@@ -1,5 +1,7 @@
 package com.genymobile.scrcpy;
 
+import com.genymobile.scrcpy.util.Ln;
+
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Application;
diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioCapture.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCapture.java
similarity index 97%
rename from server/src/main/java/com/genymobile/scrcpy/AudioCapture.java
rename to server/src/main/java/com/genymobile/scrcpy/audio/AudioCapture.java
index 3934ad49..414bfa5d 100644
--- a/server/src/main/java/com/genymobile/scrcpy/AudioCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCapture.java
@@ -1,5 +1,8 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.audio;
 
+import com.genymobile.scrcpy.FakeContext;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.Workarounds;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 
 import android.annotation.SuppressLint;
diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioCaptureForegroundException.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCaptureForegroundException.java
similarity index 84%
rename from server/src/main/java/com/genymobile/scrcpy/AudioCaptureForegroundException.java
rename to server/src/main/java/com/genymobile/scrcpy/audio/AudioCaptureForegroundException.java
index baa7d846..49cfe70f 100644
--- a/server/src/main/java/com/genymobile/scrcpy/AudioCaptureForegroundException.java
+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCaptureForegroundException.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.audio;
 
 /**
  * Exception thrown if audio capture failed on Android 11 specifically because the running App (shell) was not in foreground.
diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioCodec.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCodec.java
similarity index 93%
rename from server/src/main/java/com/genymobile/scrcpy/AudioCodec.java
rename to server/src/main/java/com/genymobile/scrcpy/audio/AudioCodec.java
index b4ea3680..8f9e59b3 100644
--- a/server/src/main/java/com/genymobile/scrcpy/AudioCodec.java
+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCodec.java
@@ -1,4 +1,6 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.audio;
+
+import com.genymobile.scrcpy.util.Codec;
 
 import android.media.MediaFormat;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
similarity index 96%
rename from server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java
rename to server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
index 0b59369b..78b6de55 100644
--- a/server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
@@ -1,4 +1,14 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.audio;
+
+import com.genymobile.scrcpy.AsyncProcessor;
+import com.genymobile.scrcpy.util.Codec;
+import com.genymobile.scrcpy.util.CodecOption;
+import com.genymobile.scrcpy.util.CodecUtils;
+import com.genymobile.scrcpy.device.ConfigurationException;
+import com.genymobile.scrcpy.util.IO;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.util.LogUtils;
+import com.genymobile.scrcpy.device.Streamer;
 
 import android.annotation.TargetApi;
 import android.media.MediaCodec;
diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioRawRecorder.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioRawRecorder.java
similarity index 93%
rename from server/src/main/java/com/genymobile/scrcpy/AudioRawRecorder.java
rename to server/src/main/java/com/genymobile/scrcpy/audio/AudioRawRecorder.java
index 7e052f32..72527600 100644
--- a/server/src/main/java/com/genymobile/scrcpy/AudioRawRecorder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioRawRecorder.java
@@ -1,4 +1,9 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.audio;
+
+import com.genymobile.scrcpy.AsyncProcessor;
+import com.genymobile.scrcpy.util.IO;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.device.Streamer;
 
 import android.media.MediaCodec;
 import android.os.Build;
diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioSource.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioSource.java
similarity index 86%
rename from server/src/main/java/com/genymobile/scrcpy/AudioSource.java
rename to server/src/main/java/com/genymobile/scrcpy/audio/AudioSource.java
index 466ea297..2324f1a4 100644
--- a/server/src/main/java/com/genymobile/scrcpy/AudioSource.java
+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioSource.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.audio;
 
 import android.media.MediaRecorder;
 
@@ -18,7 +18,7 @@ public enum AudioSource {
         return value;
     }
 
-    static AudioSource findByName(String name) {
+    public static AudioSource findByName(String name) {
         for (AudioSource audioSource : AudioSource.values()) {
             if (name.equals(audioSource.name)) {
                 return audioSource;
diff --git a/server/src/main/java/com/genymobile/scrcpy/ControlChannel.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlChannel.java
similarity index 96%
rename from server/src/main/java/com/genymobile/scrcpy/ControlChannel.java
rename to server/src/main/java/com/genymobile/scrcpy/control/ControlChannel.java
index 4677cfda..f24ca117 100644
--- a/server/src/main/java/com/genymobile/scrcpy/ControlChannel.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlChannel.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.control;
 
 import android.net.LocalSocket;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java
similarity index 98%
rename from server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
rename to server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java
index bcbacb4b..c414f2a5 100644
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java
@@ -1,4 +1,6 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.control;
+
+import com.genymobile.scrcpy.device.Position;
 
 /**
  * Union of all supported event types, identified by their {@code type}.
diff --git a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
similarity index 98%
rename from server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
rename to server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
index 1761d228..f5cfee75 100644
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
@@ -1,4 +1,8 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.control;
+
+import com.genymobile.scrcpy.util.Binary;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.device.Position;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/server/src/main/java/com/genymobile/scrcpy/Controller.java b/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
similarity index 98%
rename from server/src/main/java/com/genymobile/scrcpy/Controller.java
rename to server/src/main/java/com/genymobile/scrcpy/control/Controller.java
index b7d2f93e..85425113 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
@@ -1,5 +1,11 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.control;
 
+import com.genymobile.scrcpy.AsyncProcessor;
+import com.genymobile.scrcpy.CleanUp;
+import com.genymobile.scrcpy.device.Device;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.device.Point;
+import com.genymobile.scrcpy.device.Position;
 import com.genymobile.scrcpy.wrappers.InputManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessage.java
similarity index 97%
rename from server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java
rename to server/src/main/java/com/genymobile/scrcpy/control/DeviceMessage.java
index a8987eb6..079a7a04 100644
--- a/server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessage.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.control;
 
 public final class DeviceMessage {
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageSender.java
similarity index 94%
rename from server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java
rename to server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageSender.java
index af14bb4e..dc5e6be0 100644
--- a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageSender.java
@@ -1,4 +1,6 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.control;
+
+import com.genymobile.scrcpy.util.Ln;
 
 import java.io.IOException;
 import java.util.concurrent.ArrayBlockingQueue;
diff --git a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageWriter.java b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageWriter.java
similarity index 93%
rename from server/src/main/java/com/genymobile/scrcpy/DeviceMessageWriter.java
rename to server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageWriter.java
index f5d57c98..6bf53bed 100644
--- a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageWriter.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageWriter.java
@@ -1,4 +1,7 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.control;
+
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.util.StringUtils;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/server/src/main/java/com/genymobile/scrcpy/KeyComposition.java b/server/src/main/java/com/genymobile/scrcpy/control/KeyComposition.java
similarity index 99%
rename from server/src/main/java/com/genymobile/scrcpy/KeyComposition.java
rename to server/src/main/java/com/genymobile/scrcpy/control/KeyComposition.java
index 2f2835c9..5b988f53 100644
--- a/server/src/main/java/com/genymobile/scrcpy/KeyComposition.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/KeyComposition.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.control;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/server/src/main/java/com/genymobile/scrcpy/Pointer.java b/server/src/main/java/com/genymobile/scrcpy/control/Pointer.java
similarity index 92%
rename from server/src/main/java/com/genymobile/scrcpy/Pointer.java
rename to server/src/main/java/com/genymobile/scrcpy/control/Pointer.java
index b89cc256..02e33e10 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Pointer.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/Pointer.java
@@ -1,4 +1,6 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.control;
+
+import com.genymobile.scrcpy.device.Point;
 
 public class Pointer {
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/PointersState.java b/server/src/main/java/com/genymobile/scrcpy/control/PointersState.java
similarity index 97%
rename from server/src/main/java/com/genymobile/scrcpy/PointersState.java
rename to server/src/main/java/com/genymobile/scrcpy/control/PointersState.java
index d8daaff2..a12da71d 100644
--- a/server/src/main/java/com/genymobile/scrcpy/PointersState.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/PointersState.java
@@ -1,4 +1,6 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.control;
+
+import com.genymobile.scrcpy.device.Point;
 
 import android.view.MotionEvent;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/UhidManager.java b/server/src/main/java/com/genymobile/scrcpy/control/UhidManager.java
similarity index 98%
rename from server/src/main/java/com/genymobile/scrcpy/UhidManager.java
rename to server/src/main/java/com/genymobile/scrcpy/control/UhidManager.java
index a39288a5..b1e6a9b9 100644
--- a/server/src/main/java/com/genymobile/scrcpy/UhidManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/UhidManager.java
@@ -1,4 +1,6 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.control;
+
+import com.genymobile.scrcpy.util.Ln;
 
 import android.os.Build;
 import android.os.HandlerThread;
diff --git a/server/src/main/java/com/genymobile/scrcpy/ConfigurationException.java b/server/src/main/java/com/genymobile/scrcpy/device/ConfigurationException.java
similarity index 78%
rename from server/src/main/java/com/genymobile/scrcpy/ConfigurationException.java
rename to server/src/main/java/com/genymobile/scrcpy/device/ConfigurationException.java
index 76c8f52e..17729342 100644
--- a/server/src/main/java/com/genymobile/scrcpy/ConfigurationException.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/ConfigurationException.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.device;
 
 public class ConfigurationException extends Exception {
     public ConfigurationException(String message) {
diff --git a/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java b/server/src/main/java/com/genymobile/scrcpy/device/DesktopConnection.java
similarity index 97%
rename from server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java
rename to server/src/main/java/com/genymobile/scrcpy/device/DesktopConnection.java
index d693ad61..db75aec6 100644
--- a/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/DesktopConnection.java
@@ -1,4 +1,8 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.device;
+
+import com.genymobile.scrcpy.control.ControlChannel;
+import com.genymobile.scrcpy.util.IO;
+import com.genymobile.scrcpy.util.StringUtils;
 
 import android.net.LocalServerSocket;
 import android.net.LocalSocket;
diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/device/Device.java
similarity index 98%
rename from server/src/main/java/com/genymobile/scrcpy/Device.java
rename to server/src/main/java/com/genymobile/scrcpy/device/Device.java
index 8d0ee231..ae4f50e5 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/Device.java
@@ -1,5 +1,9 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.device;
 
+import com.genymobile.scrcpy.Options;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.util.LogUtils;
+import com.genymobile.scrcpy.video.ScreenInfo;
 import com.genymobile.scrcpy.wrappers.ClipboardManager;
 import com.genymobile.scrcpy.wrappers.DisplayControl;
 import com.genymobile.scrcpy.wrappers.InputManager;
diff --git a/server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java b/server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.java
similarity index 95%
rename from server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java
rename to server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.java
index 4b8036f8..2973710d 100644
--- a/server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.device;
 
 public final class DisplayInfo {
     private final int displayId;
diff --git a/server/src/main/java/com/genymobile/scrcpy/Point.java b/server/src/main/java/com/genymobile/scrcpy/device/Point.java
similarity index 95%
rename from server/src/main/java/com/genymobile/scrcpy/Point.java
rename to server/src/main/java/com/genymobile/scrcpy/device/Point.java
index c2a30fa8..361b9958 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Point.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/Point.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.device;
 
 import java.util.Objects;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/Position.java b/server/src/main/java/com/genymobile/scrcpy/device/Position.java
similarity index 97%
rename from server/src/main/java/com/genymobile/scrcpy/Position.java
rename to server/src/main/java/com/genymobile/scrcpy/device/Position.java
index 2d298645..7ce4e256 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Position.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/Position.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.device;
 
 import java.util.Objects;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/Size.java b/server/src/main/java/com/genymobile/scrcpy/device/Size.java
similarity index 96%
rename from server/src/main/java/com/genymobile/scrcpy/Size.java
rename to server/src/main/java/com/genymobile/scrcpy/device/Size.java
index fd4b6971..bc9dce1c 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Size.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/Size.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.device;
 
 import android.graphics.Rect;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/Streamer.java b/server/src/main/java/com/genymobile/scrcpy/device/Streamer.java
similarity index 97%
rename from server/src/main/java/com/genymobile/scrcpy/Streamer.java
rename to server/src/main/java/com/genymobile/scrcpy/device/Streamer.java
index 8b6c9dcc..f54d0567 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Streamer.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/Streamer.java
@@ -1,4 +1,8 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.device;
+
+import com.genymobile.scrcpy.audio.AudioCodec;
+import com.genymobile.scrcpy.util.Codec;
+import com.genymobile.scrcpy.util.IO;
 
 import android.media.MediaCodec;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/Binary.java b/server/src/main/java/com/genymobile/scrcpy/util/Binary.java
similarity index 96%
rename from server/src/main/java/com/genymobile/scrcpy/Binary.java
rename to server/src/main/java/com/genymobile/scrcpy/util/Binary.java
index 29534f59..f46ba695 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Binary.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/Binary.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
 public final class Binary {
     private Binary() {
diff --git a/server/src/main/java/com/genymobile/scrcpy/Codec.java b/server/src/main/java/com/genymobile/scrcpy/util/Codec.java
similarity index 82%
rename from server/src/main/java/com/genymobile/scrcpy/Codec.java
rename to server/src/main/java/com/genymobile/scrcpy/util/Codec.java
index 7e905af3..a363bd8b 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Codec.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/Codec.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
 public interface Codec {
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/CodecOption.java b/server/src/main/java/com/genymobile/scrcpy/util/CodecOption.java
similarity index 98%
rename from server/src/main/java/com/genymobile/scrcpy/CodecOption.java
rename to server/src/main/java/com/genymobile/scrcpy/util/CodecOption.java
index 22c45a90..bed2be9a 100644
--- a/server/src/main/java/com/genymobile/scrcpy/CodecOption.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/CodecOption.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/server/src/main/java/com/genymobile/scrcpy/CodecUtils.java b/server/src/main/java/com/genymobile/scrcpy/util/CodecUtils.java
similarity index 95%
rename from server/src/main/java/com/genymobile/scrcpy/CodecUtils.java
rename to server/src/main/java/com/genymobile/scrcpy/util/CodecUtils.java
index afb6f904..5b0c95e8 100644
--- a/server/src/main/java/com/genymobile/scrcpy/CodecUtils.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/CodecUtils.java
@@ -1,4 +1,7 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
+
+import com.genymobile.scrcpy.audio.AudioCodec;
+import com.genymobile.scrcpy.video.VideoCodec;
 
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
diff --git a/server/src/main/java/com/genymobile/scrcpy/Command.java b/server/src/main/java/com/genymobile/scrcpy/util/Command.java
similarity index 97%
rename from server/src/main/java/com/genymobile/scrcpy/Command.java
rename to server/src/main/java/com/genymobile/scrcpy/util/Command.java
index 362504ff..b26158e6 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Command.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/Command.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/server/src/main/java/com/genymobile/scrcpy/HandlerExecutor.java b/server/src/main/java/com/genymobile/scrcpy/util/HandlerExecutor.java
similarity index 93%
rename from server/src/main/java/com/genymobile/scrcpy/HandlerExecutor.java
rename to server/src/main/java/com/genymobile/scrcpy/util/HandlerExecutor.java
index 1f5f0a4f..03309989 100644
--- a/server/src/main/java/com/genymobile/scrcpy/HandlerExecutor.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/HandlerExecutor.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
 import android.os.Handler;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/IO.java b/server/src/main/java/com/genymobile/scrcpy/util/IO.java
similarity index 96%
rename from server/src/main/java/com/genymobile/scrcpy/IO.java
rename to server/src/main/java/com/genymobile/scrcpy/util/IO.java
index 4a55c152..ab3fa59f 100644
--- a/server/src/main/java/com/genymobile/scrcpy/IO.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/IO.java
@@ -1,4 +1,6 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
+
+import com.genymobile.scrcpy.BuildConfig;
 
 import android.system.ErrnoException;
 import android.system.Os;
diff --git a/server/src/main/java/com/genymobile/scrcpy/Ln.java b/server/src/main/java/com/genymobile/scrcpy/util/Ln.java
similarity index 98%
rename from server/src/main/java/com/genymobile/scrcpy/Ln.java
rename to server/src/main/java/com/genymobile/scrcpy/util/Ln.java
index cdd57b9f..c0700125 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Ln.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/Ln.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
 import android.util.Log;
 
@@ -19,7 +19,7 @@ public final class Ln {
     private static final PrintStream CONSOLE_OUT = new PrintStream(new FileOutputStream(FileDescriptor.out));
     private static final PrintStream CONSOLE_ERR = new PrintStream(new FileOutputStream(FileDescriptor.err));
 
-    enum Level {
+    public enum Level {
         VERBOSE, DEBUG, INFO, WARN, ERROR
     }
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/LogUtils.java b/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java
similarity index 98%
rename from server/src/main/java/com/genymobile/scrcpy/LogUtils.java
rename to server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java
index 1ffb19d3..aee1594a 100644
--- a/server/src/main/java/com/genymobile/scrcpy/LogUtils.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java
@@ -1,5 +1,7 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
+import com.genymobile.scrcpy.device.DisplayInfo;
+import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.wrappers.DisplayManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/Settings.java b/server/src/main/java/com/genymobile/scrcpy/util/Settings.java
similarity index 98%
rename from server/src/main/java/com/genymobile/scrcpy/Settings.java
rename to server/src/main/java/com/genymobile/scrcpy/util/Settings.java
index 1b5e5f98..d9e82d62 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Settings.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/Settings.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
 import com.genymobile.scrcpy.wrappers.ContentProvider;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
diff --git a/server/src/main/java/com/genymobile/scrcpy/SettingsException.java b/server/src/main/java/com/genymobile/scrcpy/util/SettingsException.java
similarity index 92%
rename from server/src/main/java/com/genymobile/scrcpy/SettingsException.java
rename to server/src/main/java/com/genymobile/scrcpy/util/SettingsException.java
index 36ef63ee..87fa3884 100644
--- a/server/src/main/java/com/genymobile/scrcpy/SettingsException.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/SettingsException.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
 public class SettingsException extends Exception {
     private static String createMessage(String method, String table, String key, String value) {
diff --git a/server/src/main/java/com/genymobile/scrcpy/StringUtils.java b/server/src/main/java/com/genymobile/scrcpy/util/StringUtils.java
similarity index 94%
rename from server/src/main/java/com/genymobile/scrcpy/StringUtils.java
rename to server/src/main/java/com/genymobile/scrcpy/util/StringUtils.java
index dac05466..8b19ca3d 100644
--- a/server/src/main/java/com/genymobile/scrcpy/StringUtils.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/StringUtils.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
 public final class StringUtils {
     private StringUtils() {
diff --git a/server/src/main/java/com/genymobile/scrcpy/CameraAspectRatio.java b/server/src/main/java/com/genymobile/scrcpy/video/CameraAspectRatio.java
similarity index 96%
rename from server/src/main/java/com/genymobile/scrcpy/CameraAspectRatio.java
rename to server/src/main/java/com/genymobile/scrcpy/video/CameraAspectRatio.java
index 4fdf4c74..bf1cba5d 100644
--- a/server/src/main/java/com/genymobile/scrcpy/CameraAspectRatio.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/CameraAspectRatio.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.video;
 
 public final class CameraAspectRatio {
     private static final float SENSOR = -1;
diff --git a/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java
similarity index 98%
rename from server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
rename to server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java
index df3cf7c4..7d2e2055 100644
--- a/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java
@@ -1,5 +1,8 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.video;
 
+import com.genymobile.scrcpy.util.HandlerExecutor;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 
 import android.annotation.SuppressLint;
diff --git a/server/src/main/java/com/genymobile/scrcpy/CameraFacing.java b/server/src/main/java/com/genymobile/scrcpy/video/CameraFacing.java
similarity index 89%
rename from server/src/main/java/com/genymobile/scrcpy/CameraFacing.java
rename to server/src/main/java/com/genymobile/scrcpy/video/CameraFacing.java
index b7e8daa5..f818e665 100644
--- a/server/src/main/java/com/genymobile/scrcpy/CameraFacing.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/CameraFacing.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.video;
 
 import android.annotation.SuppressLint;
 import android.hardware.camera2.CameraCharacteristics;
@@ -21,7 +21,7 @@ public enum CameraFacing {
         return value;
     }
 
-    static CameraFacing findByName(String name) {
+    public static CameraFacing findByName(String name) {
         for (CameraFacing facing : CameraFacing.values()) {
             if (name.equals(facing.name)) {
                 return facing;
diff --git a/server/src/main/java/com/genymobile/scrcpy/ScreenCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
similarity index 96%
rename from server/src/main/java/com/genymobile/scrcpy/ScreenCapture.java
rename to server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
index 090c96f0..fbeca2af 100644
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
@@ -1,5 +1,8 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.video;
 
+import com.genymobile.scrcpy.device.Device;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 import com.genymobile.scrcpy.wrappers.SurfaceControl;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java b/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java
similarity index 96%
rename from server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java
rename to server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java
index 8e5b401f..ba537b17 100644
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java
@@ -1,4 +1,9 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.video;
+
+import com.genymobile.scrcpy.BuildConfig;
+import com.genymobile.scrcpy.device.Device;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.device.Size;
 
 import android.graphics.Rect;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/SurfaceCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java
similarity index 95%
rename from server/src/main/java/com/genymobile/scrcpy/SurfaceCapture.java
rename to server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java
index e300e4d6..3118ddc8 100644
--- a/server/src/main/java/com/genymobile/scrcpy/SurfaceCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java
@@ -1,4 +1,6 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.video;
+
+import com.genymobile.scrcpy.device.Size;
 
 import android.view.Surface;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/SurfaceEncoder.java b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
similarity index 95%
rename from server/src/main/java/com/genymobile/scrcpy/SurfaceEncoder.java
rename to server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
index 4a0fdf4e..8fe0b227 100644
--- a/server/src/main/java/com/genymobile/scrcpy/SurfaceEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
@@ -1,4 +1,15 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.video;
+
+import com.genymobile.scrcpy.AsyncProcessor;
+import com.genymobile.scrcpy.util.Codec;
+import com.genymobile.scrcpy.util.CodecOption;
+import com.genymobile.scrcpy.util.CodecUtils;
+import com.genymobile.scrcpy.device.ConfigurationException;
+import com.genymobile.scrcpy.util.IO;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.util.LogUtils;
+import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.device.Streamer;
 
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
diff --git a/server/src/main/java/com/genymobile/scrcpy/VideoCodec.java b/server/src/main/java/com/genymobile/scrcpy/video/VideoCodec.java
similarity index 93%
rename from server/src/main/java/com/genymobile/scrcpy/VideoCodec.java
rename to server/src/main/java/com/genymobile/scrcpy/video/VideoCodec.java
index fa787a99..5d528da1 100644
--- a/server/src/main/java/com/genymobile/scrcpy/VideoCodec.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/VideoCodec.java
@@ -1,4 +1,6 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.video;
+
+import com.genymobile.scrcpy.util.Codec;
 
 import android.annotation.SuppressLint;
 import android.media.MediaFormat;
diff --git a/server/src/main/java/com/genymobile/scrcpy/VideoSource.java b/server/src/main/java/com/genymobile/scrcpy/video/VideoSource.java
similarity index 80%
rename from server/src/main/java/com/genymobile/scrcpy/VideoSource.java
rename to server/src/main/java/com/genymobile/scrcpy/video/VideoSource.java
index b5a74fbe..53b54a52 100644
--- a/server/src/main/java/com/genymobile/scrcpy/VideoSource.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/VideoSource.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.video;
 
 public enum VideoSource {
     DISPLAY("display"),
@@ -10,7 +10,7 @@ public enum VideoSource {
         this.name = name;
     }
 
-    static VideoSource findByName(String name) {
+    public static VideoSource findByName(String name) {
         for (VideoSource videoSource : VideoSource.values()) {
             if (name.equals(videoSource.name)) {
                 return videoSource;
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java
index d4bee165..bb1ca0d4 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java
@@ -1,7 +1,7 @@
 package com.genymobile.scrcpy.wrappers;
 
 import com.genymobile.scrcpy.FakeContext;
-import com.genymobile.scrcpy.Ln;
+import com.genymobile.scrcpy.util.Ln;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
index a0e3a7e1..c5f007fe 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
@@ -1,7 +1,7 @@
 package com.genymobile.scrcpy.wrappers;
 
 import com.genymobile.scrcpy.FakeContext;
-import com.genymobile.scrcpy.Ln;
+import com.genymobile.scrcpy.util.Ln;
 
 import android.content.ClipData;
 import android.content.IOnPrimaryClipChangedListener;
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java
index a03f824e..7e92ac50 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java
@@ -1,8 +1,8 @@
 package com.genymobile.scrcpy.wrappers;
 
 import com.genymobile.scrcpy.FakeContext;
-import com.genymobile.scrcpy.Ln;
-import com.genymobile.scrcpy.SettingsException;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.util.SettingsException;
 
 import android.annotation.SuppressLint;
 import android.content.AttributionSource;
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java
index ba3e9ee0..cc9d5526 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java
@@ -1,6 +1,6 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.Ln;
+import com.genymobile.scrcpy.util.Ln;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
index 2ff82d04..dd92330c 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
@@ -1,9 +1,9 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.Command;
-import com.genymobile.scrcpy.DisplayInfo;
-import com.genymobile.scrcpy.Ln;
-import com.genymobile.scrcpy.Size;
+import com.genymobile.scrcpy.util.Command;
+import com.genymobile.scrcpy.device.DisplayInfo;
+import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.device.Size;
 
 import android.annotation.SuppressLint;
 import android.hardware.display.VirtualDisplay;
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
index 16ecb09f..5c5ba56c 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
@@ -1,6 +1,6 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.Ln;
+import com.genymobile.scrcpy.util.Ln;
 
 import android.annotation.SuppressLint;
 import android.view.InputEvent;
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java
index 36d5f1ac..0a56f347 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java
@@ -1,6 +1,6 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.Ln;
+import com.genymobile.scrcpy.util.Ln;
 
 import android.annotation.SuppressLint;
 import android.os.Build;
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java
index af217da2..ca80dde2 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java
@@ -1,6 +1,6 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.Ln;
+import com.genymobile.scrcpy.util.Ln;
 
 import android.os.IInterface;
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java
index f0e351a2..fc18a8e2 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java
@@ -1,6 +1,6 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.Ln;
+import com.genymobile.scrcpy.util.Ln;
 
 import android.annotation.SuppressLint;
 import android.graphics.Rect;
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
index 44394ba9..4c769e85 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
@@ -1,6 +1,6 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.Ln;
+import com.genymobile.scrcpy.util.Ln;
 
 import android.annotation.TargetApi;
 import android.os.IInterface;
diff --git a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java b/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java
similarity index 99%
rename from server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
rename to server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java
index 0c8086f7..1737730f 100644
--- a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java
@@ -1,4 +1,6 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.control;
+
+import com.genymobile.scrcpy.device.Device;
 
 import android.view.KeyEvent;
 import android.view.MotionEvent;
diff --git a/server/src/test/java/com/genymobile/scrcpy/DeviceMessageWriterTest.java b/server/src/test/java/com/genymobile/scrcpy/control/DeviceMessageWriterTest.java
similarity index 98%
rename from server/src/test/java/com/genymobile/scrcpy/DeviceMessageWriterTest.java
rename to server/src/test/java/com/genymobile/scrcpy/control/DeviceMessageWriterTest.java
index d7f926ba..ff1a2fbc 100644
--- a/server/src/test/java/com/genymobile/scrcpy/DeviceMessageWriterTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/control/DeviceMessageWriterTest.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.control;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/server/src/test/java/com/genymobile/scrcpy/BinaryTest.java b/server/src/test/java/com/genymobile/scrcpy/util/BinaryTest.java
similarity index 98%
rename from server/src/test/java/com/genymobile/scrcpy/BinaryTest.java
rename to server/src/test/java/com/genymobile/scrcpy/util/BinaryTest.java
index 569a2f2c..7ee95ac5 100644
--- a/server/src/test/java/com/genymobile/scrcpy/BinaryTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/util/BinaryTest.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.java b/server/src/test/java/com/genymobile/scrcpy/util/CodecOptionsTest.java
similarity index 99%
rename from server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.java
rename to server/src/test/java/com/genymobile/scrcpy/util/CodecOptionsTest.java
index ad802258..ffd8e32e 100644
--- a/server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/util/CodecOptionsTest.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/server/src/test/java/com/genymobile/scrcpy/CommandParserTest.java b/server/src/test/java/com/genymobile/scrcpy/util/CommandParserTest.java
similarity index 99%
rename from server/src/test/java/com/genymobile/scrcpy/CommandParserTest.java
rename to server/src/test/java/com/genymobile/scrcpy/util/CommandParserTest.java
index de996a07..7e1d55b5 100644
--- a/server/src/test/java/com/genymobile/scrcpy/CommandParserTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/util/CommandParserTest.java
@@ -1,5 +1,6 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
+import com.genymobile.scrcpy.device.DisplayInfo;
 import com.genymobile.scrcpy.wrappers.DisplayManager;
 
 import android.view.Display;
diff --git a/server/src/test/java/com/genymobile/scrcpy/StringUtilsTest.java b/server/src/test/java/com/genymobile/scrcpy/util/StringUtilsTest.java
similarity index 97%
rename from server/src/test/java/com/genymobile/scrcpy/StringUtilsTest.java
rename to server/src/test/java/com/genymobile/scrcpy/util/StringUtilsTest.java
index 89799c5e..c72b112a 100644
--- a/server/src/test/java/com/genymobile/scrcpy/StringUtilsTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/util/StringUtilsTest.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy;
+package com.genymobile.scrcpy.util;
 
 import org.junit.Assert;
 import org.junit.Test;