Skip to content

Display and control your Android device

Reorganize server packages

Romain Vimontb38ba2f6871e
diff --git a/server/src/main/java/com/genymobile/scrcpy/Options.java b/server/src/main/java/com/genymobile/scrcpy/Options.java
index aba8251e..39732872 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -3,10 +3,10 @@ package com.genymobile.scrcpy;
import com.genymobile.scrcpy.audio.AudioCodec;
import com.genymobile.scrcpy.audio.AudioSource;
import com.genymobile.scrcpy.device.Device;
-import com.genymobile.scrcpy.device.NewDisplay;
-import com.genymobile.scrcpy.device.Orientation;
-import com.genymobile.scrcpy.device.Size;
-import com.genymobile.scrcpy.util.CodecOption;
+import com.genymobile.scrcpy.model.CodecOption;
+import com.genymobile.scrcpy.model.NewDisplay;
+import com.genymobile.scrcpy.model.Orientation;
+import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.Ln;
import com.genymobile.scrcpy.video.CameraAspectRatio;
import com.genymobile.scrcpy.video.CameraFacing;
diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.java
index d52f2d0d..e3f1680d 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -9,11 +9,11 @@ import com.genymobile.scrcpy.audio.AudioRawRecorder;
import com.genymobile.scrcpy.audio.AudioSource;
import com.genymobile.scrcpy.control.ControlChannel;
import com.genymobile.scrcpy.control.Controller;
-import com.genymobile.scrcpy.device.ConfigurationException;
import com.genymobile.scrcpy.device.DesktopConnection;
import com.genymobile.scrcpy.device.Device;
-import com.genymobile.scrcpy.device.NewDisplay;
import com.genymobile.scrcpy.device.Streamer;
+import com.genymobile.scrcpy.model.ConfigurationException;
+import com.genymobile.scrcpy.model.NewDisplay;
import com.genymobile.scrcpy.opengl.OpenGLRunner;
import com.genymobile.scrcpy.util.Ln;
import com.genymobile.scrcpy.util.LogUtils;
diff --git a/server/src/main/java/com/genymobile/scrcpy/audio/AudioCodec.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCodec.java
index 8f9e59b3..5e20a2a6 100644
--- a/server/src/main/java/com/genymobile/scrcpy/audio/AudioCodec.java
+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCodec.java
@@ -1,6 +1,6 @@
package com.genymobile.scrcpy.audio;
-import com.genymobile.scrcpy.util.Codec;
+import com.genymobile.scrcpy.model.Codec;
import android.media.MediaFormat;
diff --git a/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
index a8e9c708..1be21ebd 100644
--- a/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
@@ -3,10 +3,10 @@ package com.genymobile.scrcpy.audio;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.AsyncProcessor;
import com.genymobile.scrcpy.Options;
-import com.genymobile.scrcpy.device.ConfigurationException;
import com.genymobile.scrcpy.device.Streamer;
-import com.genymobile.scrcpy.util.Codec;
-import com.genymobile.scrcpy.util.CodecOption;
+import com.genymobile.scrcpy.model.Codec;
+import com.genymobile.scrcpy.model.CodecOption;
+import com.genymobile.scrcpy.model.ConfigurationException;
import com.genymobile.scrcpy.util.CodecUtils;
import com.genymobile.scrcpy.util.IO;
import com.genymobile.scrcpy.util.Ln;
diff --git a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java
index 6aea226e..098046ed 100644
--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java
@@ -1,6 +1,6 @@
package com.genymobile.scrcpy.control;
-import com.genymobile.scrcpy.device.Position;
+import com.genymobile.scrcpy.model.Position;
/**
* Union of all supported event types, identified by their {@code type}.
diff --git a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
index fd29edbe..13a853df 100644
--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
@@ -1,6 +1,6 @@
package com.genymobile.scrcpy.control;
-import com.genymobile.scrcpy.device.Position;
+import com.genymobile.scrcpy.model.Position;
import com.genymobile.scrcpy.util.Binary;
import java.io.BufferedInputStream;
diff --git a/server/src/main/java/com/genymobile/scrcpy/control/Controller.java b/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
index 985bdd05..38ead2cf 100644
--- a/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
@@ -5,11 +5,11 @@ import com.genymobile.scrcpy.AsyncProcessor;
import com.genymobile.scrcpy.CleanUp;
import com.genymobile.scrcpy.Options;
import com.genymobile.scrcpy.device.Device;
-import com.genymobile.scrcpy.device.DeviceApp;
-import com.genymobile.scrcpy.device.DisplayInfo;
-import com.genymobile.scrcpy.device.Point;
-import com.genymobile.scrcpy.device.Position;
-import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.display.DisplayInfo;
+import com.genymobile.scrcpy.model.DeviceApp;
+import com.genymobile.scrcpy.model.Point;
+import com.genymobile.scrcpy.model.Position;
+import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.Ln;
import com.genymobile.scrcpy.util.LogUtils;
import com.genymobile.scrcpy.video.CameraCapture;
diff --git a/server/src/main/java/com/genymobile/scrcpy/control/Pointer.java b/server/src/main/java/com/genymobile/scrcpy/control/Pointer.java
index 02e33e10..4624a159 100644
--- a/server/src/main/java/com/genymobile/scrcpy/control/Pointer.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/Pointer.java
@@ -1,6 +1,6 @@
package com.genymobile.scrcpy.control;
-import com.genymobile.scrcpy.device.Point;
+import com.genymobile.scrcpy.model.Point;
public class Pointer {
diff --git a/server/src/main/java/com/genymobile/scrcpy/control/PointersState.java b/server/src/main/java/com/genymobile/scrcpy/control/PointersState.java
index a12da71d..efe16f0c 100644
--- a/server/src/main/java/com/genymobile/scrcpy/control/PointersState.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/PointersState.java
@@ -1,6 +1,6 @@
package com.genymobile.scrcpy.control;
-import com.genymobile.scrcpy.device.Point;
+import com.genymobile.scrcpy.model.Point;
import android.view.MotionEvent;
diff --git a/server/src/main/java/com/genymobile/scrcpy/control/PositionMapper.java b/server/src/main/java/com/genymobile/scrcpy/control/PositionMapper.java
index 60109b51..e8daed9a 100644
--- a/server/src/main/java/com/genymobile/scrcpy/control/PositionMapper.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/PositionMapper.java
@@ -1,8 +1,8 @@
package com.genymobile.scrcpy.control;
-import com.genymobile.scrcpy.device.Point;
-import com.genymobile.scrcpy.device.Position;
-import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.model.Point;
+import com.genymobile.scrcpy.model.Position;
+import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.AffineMatrix;
public final class PositionMapper {
diff --git a/server/src/main/java/com/genymobile/scrcpy/device/Device.java b/server/src/main/java/com/genymobile/scrcpy/device/Device.java
index 3553dc27..0aec6d0a 100644
--- a/server/src/main/java/com/genymobile/scrcpy/device/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/Device.java
@@ -2,6 +2,8 @@ package com.genymobile.scrcpy.device;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.FakeContext;
+import com.genymobile.scrcpy.display.DisplayInfo;
+import com.genymobile.scrcpy.model.DeviceApp;
import com.genymobile.scrcpy.util.Ln;
import com.genymobile.scrcpy.wrappers.ActivityManager;
import com.genymobile.scrcpy.wrappers.ClipboardManager;
@@ -12,8 +14,8 @@ import com.genymobile.scrcpy.wrappers.SurfaceControl;
import com.genymobile.scrcpy.wrappers.WindowManager;
import android.annotation.SuppressLint;
-import android.content.Intent;
import android.app.ActivityOptions;
+import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.os.Build;
diff --git a/server/src/main/java/com/genymobile/scrcpy/device/Streamer.java b/server/src/main/java/com/genymobile/scrcpy/device/Streamer.java
index 73d28292..a00b0280 100644
--- a/server/src/main/java/com/genymobile/scrcpy/device/Streamer.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/Streamer.java
@@ -1,7 +1,7 @@
package com.genymobile.scrcpy.device;
import com.genymobile.scrcpy.audio.AudioCodec;
-import com.genymobile.scrcpy.util.Codec;
+import com.genymobile.scrcpy.model.Codec;
import com.genymobile.scrcpy.util.IO;
import android.media.MediaCodec;
diff --git a/server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.java b/server/src/main/java/com/genymobile/scrcpy/display/DisplayInfo.java
similarity index 93%
rename from server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.java
rename to server/src/main/java/com/genymobile/scrcpy/display/DisplayInfo.java
index 8d26b7ce..ea966a3e 100644
--- a/server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.java
+++ b/server/src/main/java/com/genymobile/scrcpy/display/DisplayInfo.java
@@ -1,4 +1,6 @@
-package com.genymobile.scrcpy.device;
+package com.genymobile.scrcpy.display;
+
+import com.genymobile.scrcpy.model.Size;
public final class DisplayInfo {
private final int displayId;
diff --git a/server/src/main/java/com/genymobile/scrcpy/video/DisplaySizeMonitor.java b/server/src/main/java/com/genymobile/scrcpy/display/DisplaySizeMonitor.java
similarity index 97%
rename from server/src/main/java/com/genymobile/scrcpy/video/DisplaySizeMonitor.java
rename to server/src/main/java/com/genymobile/scrcpy/display/DisplaySizeMonitor.java
index f2cde7e7..b8e4e6f2 100644
--- a/server/src/main/java/com/genymobile/scrcpy/video/DisplaySizeMonitor.java
+++ b/server/src/main/java/com/genymobile/scrcpy/display/DisplaySizeMonitor.java
@@ -1,9 +1,8 @@
-package com.genymobile.scrcpy.video;
+package com.genymobile.scrcpy.display;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.device.Device;
-import com.genymobile.scrcpy.device.DisplayInfo;
-import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.Ln;
import com.genymobile.scrcpy.wrappers.DisplayManager;
import com.genymobile.scrcpy.wrappers.DisplayWindowListener;
diff --git a/server/src/main/java/com/genymobile/scrcpy/util/Codec.java b/server/src/main/java/com/genymobile/scrcpy/model/Codec.java
similarity index 91%
rename from server/src/main/java/com/genymobile/scrcpy/util/Codec.java
rename to server/src/main/java/com/genymobile/scrcpy/model/Codec.java
index b350409b..b1117102 100644
--- a/server/src/main/java/com/genymobile/scrcpy/util/Codec.java
+++ b/server/src/main/java/com/genymobile/scrcpy/model/Codec.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy.util;
+package com.genymobile.scrcpy.model;
import android.media.MediaCodec;
diff --git a/server/src/main/java/com/genymobile/scrcpy/util/CodecOption.java b/server/src/main/java/com/genymobile/scrcpy/model/CodecOption.java
similarity index 98%
rename from server/src/main/java/com/genymobile/scrcpy/util/CodecOption.java
rename to server/src/main/java/com/genymobile/scrcpy/model/CodecOption.java
index bed2be9a..8b356cd9 100644
--- a/server/src/main/java/com/genymobile/scrcpy/util/CodecOption.java
+++ b/server/src/main/java/com/genymobile/scrcpy/model/CodecOption.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy.util;
+package com.genymobile.scrcpy.model;
import java.util.ArrayList;
import java.util.List;
diff --git a/server/src/main/java/com/genymobile/scrcpy/device/ConfigurationException.java b/server/src/main/java/com/genymobile/scrcpy/model/ConfigurationException.java
similarity index 78%
rename from server/src/main/java/com/genymobile/scrcpy/device/ConfigurationException.java
rename to server/src/main/java/com/genymobile/scrcpy/model/ConfigurationException.java
index 17729342..0e5deaaa 100644
--- a/server/src/main/java/com/genymobile/scrcpy/device/ConfigurationException.java
+++ b/server/src/main/java/com/genymobile/scrcpy/model/ConfigurationException.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy.device;
+package com.genymobile.scrcpy.model;
public class ConfigurationException extends Exception {
public ConfigurationException(String message) {
diff --git a/server/src/main/java/com/genymobile/scrcpy/device/DeviceApp.java b/server/src/main/java/com/genymobile/scrcpy/model/DeviceApp.java
similarity index 93%
rename from server/src/main/java/com/genymobile/scrcpy/device/DeviceApp.java
rename to server/src/main/java/com/genymobile/scrcpy/model/DeviceApp.java
index ed292efa..60e7e879 100644
--- a/server/src/main/java/com/genymobile/scrcpy/device/DeviceApp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/model/DeviceApp.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy.device;
+package com.genymobile.scrcpy.model;
public final class DeviceApp {
diff --git a/server/src/main/java/com/genymobile/scrcpy/device/NewDisplay.java b/server/src/main/java/com/genymobile/scrcpy/model/NewDisplay.java
similarity index 92%
rename from server/src/main/java/com/genymobile/scrcpy/device/NewDisplay.java
rename to server/src/main/java/com/genymobile/scrcpy/model/NewDisplay.java
index 3aa2996a..2544f076 100644
--- a/server/src/main/java/com/genymobile/scrcpy/device/NewDisplay.java
+++ b/server/src/main/java/com/genymobile/scrcpy/model/NewDisplay.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy.device;
+package com.genymobile.scrcpy.model;
public final class NewDisplay {
private Size size;
diff --git a/server/src/main/java/com/genymobile/scrcpy/device/Orientation.java b/server/src/main/java/com/genymobile/scrcpy/model/Orientation.java
similarity index 96%
rename from server/src/main/java/com/genymobile/scrcpy/device/Orientation.java
rename to server/src/main/java/com/genymobile/scrcpy/model/Orientation.java
index 81168aae..62698569 100644
--- a/server/src/main/java/com/genymobile/scrcpy/device/Orientation.java
+++ b/server/src/main/java/com/genymobile/scrcpy/model/Orientation.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy.device;
+package com.genymobile.scrcpy.model;
public enum Orientation {
diff --git a/server/src/main/java/com/genymobile/scrcpy/device/Point.java b/server/src/main/java/com/genymobile/scrcpy/model/Point.java
similarity index 95%
rename from server/src/main/java/com/genymobile/scrcpy/device/Point.java
rename to server/src/main/java/com/genymobile/scrcpy/model/Point.java
index 361b9958..8a8458f3 100644
--- a/server/src/main/java/com/genymobile/scrcpy/device/Point.java
+++ b/server/src/main/java/com/genymobile/scrcpy/model/Point.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy.device;
+package com.genymobile.scrcpy.model;
import java.util.Objects;
diff --git a/server/src/main/java/com/genymobile/scrcpy/device/Position.java b/server/src/main/java/com/genymobile/scrcpy/model/Position.java
similarity index 97%
rename from server/src/main/java/com/genymobile/scrcpy/device/Position.java
rename to server/src/main/java/com/genymobile/scrcpy/model/Position.java
index 7ce4e256..61fd1247 100644
--- a/server/src/main/java/com/genymobile/scrcpy/device/Position.java
+++ b/server/src/main/java/com/genymobile/scrcpy/model/Position.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy.device;
+package com.genymobile.scrcpy.model;
import java.util.Objects;
diff --git a/server/src/main/java/com/genymobile/scrcpy/device/Size.java b/server/src/main/java/com/genymobile/scrcpy/model/Size.java
similarity index 98%
rename from server/src/main/java/com/genymobile/scrcpy/device/Size.java
rename to server/src/main/java/com/genymobile/scrcpy/model/Size.java
index 36161758..13c6c288 100644
--- a/server/src/main/java/com/genymobile/scrcpy/device/Size.java
+++ b/server/src/main/java/com/genymobile/scrcpy/model/Size.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy.device;
+package com.genymobile.scrcpy.model;
import com.genymobile.scrcpy.video.VideoConstraints;
diff --git a/server/src/main/java/com/genymobile/scrcpy/opengl/OpenGLRunner.java b/server/src/main/java/com/genymobile/scrcpy/opengl/OpenGLRunner.java
index 06bcd7eb..d7204010 100644
--- a/server/src/main/java/com/genymobile/scrcpy/opengl/OpenGLRunner.java
+++ b/server/src/main/java/com/genymobile/scrcpy/opengl/OpenGLRunner.java
@@ -1,6 +1,6 @@
package com.genymobile.scrcpy.opengl;
-import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.Threads;
import android.graphics.SurfaceTexture;
diff --git a/server/src/main/java/com/genymobile/scrcpy/util/AffineMatrix.java b/server/src/main/java/com/genymobile/scrcpy/util/AffineMatrix.java
index 0db74af6..fb507ba8 100644
--- a/server/src/main/java/com/genymobile/scrcpy/util/AffineMatrix.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/AffineMatrix.java
@@ -1,7 +1,7 @@
package com.genymobile.scrcpy.util;
-import com.genymobile.scrcpy.device.Point;
-import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.model.Point;
+import com.genymobile.scrcpy.model.Size;
/**
* Represents a 2D affine transform (a 3x3 matrix):
diff --git a/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java b/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java
index 05884baa..4f4605ea 100644
--- a/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java
@@ -3,9 +3,10 @@ package com.genymobile.scrcpy.util;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.audio.AudioCodec;
import com.genymobile.scrcpy.device.Device;
-import com.genymobile.scrcpy.device.DeviceApp;
-import com.genymobile.scrcpy.device.DisplayInfo;
-import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.display.DisplayInfo;
+import com.genymobile.scrcpy.model.Codec;
+import com.genymobile.scrcpy.model.DeviceApp;
+import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.video.VideoCodec;
import com.genymobile.scrcpy.wrappers.DisplayManager;
import com.genymobile.scrcpy.wrappers.ServiceManager;
diff --git a/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java
index c99147ed..4124854c 100644
--- a/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java
@@ -2,9 +2,9 @@ package com.genymobile.scrcpy.video;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.Options;
-import com.genymobile.scrcpy.device.ConfigurationException;
-import com.genymobile.scrcpy.device.Orientation;
-import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.model.ConfigurationException;
+import com.genymobile.scrcpy.model.Orientation;
+import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.opengl.AffineOpenGLFilter;
import com.genymobile.scrcpy.opengl.OpenGLFilter;
import com.genymobile.scrcpy.opengl.OpenGLRunner;
diff --git a/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java
index 8a545e8e..ae728772 100644
--- a/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java
@@ -3,10 +3,11 @@ package com.genymobile.scrcpy.video;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.Options;
import com.genymobile.scrcpy.control.PositionMapper;
-import com.genymobile.scrcpy.device.DisplayInfo;
-import com.genymobile.scrcpy.device.NewDisplay;
-import com.genymobile.scrcpy.device.Orientation;
-import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.display.DisplayInfo;
+import com.genymobile.scrcpy.display.DisplaySizeMonitor;
+import com.genymobile.scrcpy.model.NewDisplay;
+import com.genymobile.scrcpy.model.Orientation;
+import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.opengl.AffineOpenGLFilter;
import com.genymobile.scrcpy.opengl.OpenGLFilter;
import com.genymobile.scrcpy.opengl.OpenGLRunner;
diff --git a/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
index 7310e7b6..77d2eb17 100644
--- a/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
@@ -3,11 +3,12 @@ package com.genymobile.scrcpy.video;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.Options;
import com.genymobile.scrcpy.control.PositionMapper;
-import com.genymobile.scrcpy.device.ConfigurationException;
import com.genymobile.scrcpy.device.Device;
-import com.genymobile.scrcpy.device.DisplayInfo;
-import com.genymobile.scrcpy.device.Orientation;
-import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.display.DisplayInfo;
+import com.genymobile.scrcpy.display.DisplaySizeMonitor;
+import com.genymobile.scrcpy.model.ConfigurationException;
+import com.genymobile.scrcpy.model.Orientation;
+import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.opengl.AffineOpenGLFilter;
import com.genymobile.scrcpy.opengl.OpenGLFilter;
import com.genymobile.scrcpy.opengl.OpenGLRunner;
diff --git a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java
index 18633c84..908aff1e 100644
--- a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java
@@ -1,7 +1,7 @@
package com.genymobile.scrcpy.video;
-import com.genymobile.scrcpy.device.ConfigurationException;
-import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.model.ConfigurationException;
+import com.genymobile.scrcpy.model.Size;
import android.view.Surface;
diff --git a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
index bb6af319..0333203e 100644
--- a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
@@ -3,11 +3,11 @@ package com.genymobile.scrcpy.video;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.AsyncProcessor;
import com.genymobile.scrcpy.Options;
-import com.genymobile.scrcpy.device.ConfigurationException;
-import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.device.Streamer;
-import com.genymobile.scrcpy.util.Codec;
-import com.genymobile.scrcpy.util.CodecOption;
+import com.genymobile.scrcpy.model.Codec;
+import com.genymobile.scrcpy.model.CodecOption;
+import com.genymobile.scrcpy.model.ConfigurationException;
+import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.CodecUtils;
import com.genymobile.scrcpy.util.IO;
import com.genymobile.scrcpy.util.Ln;
diff --git a/server/src/main/java/com/genymobile/scrcpy/video/VideoCodec.java b/server/src/main/java/com/genymobile/scrcpy/video/VideoCodec.java
index 5d528da1..5f19603d 100644
--- a/server/src/main/java/com/genymobile/scrcpy/video/VideoCodec.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/VideoCodec.java
@@ -1,6 +1,6 @@
package com.genymobile.scrcpy.video;
-import com.genymobile.scrcpy.util.Codec;
+import com.genymobile.scrcpy.model.Codec;
import android.annotation.SuppressLint;
import android.media.MediaFormat;
diff --git a/server/src/main/java/com/genymobile/scrcpy/video/VideoConstraints.java b/server/src/main/java/com/genymobile/scrcpy/video/VideoConstraints.java
index f688efcb..eb3b8887 100644
--- a/server/src/main/java/com/genymobile/scrcpy/video/VideoConstraints.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/VideoConstraints.java
@@ -1,6 +1,6 @@
package com.genymobile.scrcpy.video;
-import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.model.Size;
public class VideoConstraints {
private final int maxSize;
diff --git a/server/src/main/java/com/genymobile/scrcpy/video/VideoFilter.java b/server/src/main/java/com/genymobile/scrcpy/video/VideoFilter.java
index a27915ee..9a0dec6b 100644
--- a/server/src/main/java/com/genymobile/scrcpy/video/VideoFilter.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/VideoFilter.java
@@ -1,7 +1,7 @@
package com.genymobile.scrcpy.video;
-import com.genymobile.scrcpy.device.Orientation;
-import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.model.Orientation;
+import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.AffineMatrix;
import android.graphics.Rect;
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 9e84ec00..1be04c3a 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
@@ -2,8 +2,8 @@ package com.genymobile.scrcpy.wrappers;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.FakeContext;
-import com.genymobile.scrcpy.device.DisplayInfo;
-import com.genymobile.scrcpy.device.Size;
+import com.genymobile.scrcpy.display.DisplayInfo;
+import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.Command;
import com.genymobile.scrcpy.util.Ln;
diff --git a/server/src/test/java/com/genymobile/scrcpy/util/CodecOptionsTest.java b/server/src/test/java/com/genymobile/scrcpy/model/CodecOptionsTest.java
similarity index 99%
rename from server/src/test/java/com/genymobile/scrcpy/util/CodecOptionsTest.java
rename to server/src/test/java/com/genymobile/scrcpy/model/CodecOptionsTest.java
index ffd8e32e..36f1d86e 100644
--- a/server/src/test/java/com/genymobile/scrcpy/util/CodecOptionsTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/model/CodecOptionsTest.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy.util;
+package com.genymobile.scrcpy.model;
import org.junit.Assert;
import org.junit.Test;
diff --git a/server/src/test/java/com/genymobile/scrcpy/device/SizeTest.java b/server/src/test/java/com/genymobile/scrcpy/model/SizeTest.java
similarity index 98%
rename from server/src/test/java/com/genymobile/scrcpy/device/SizeTest.java
rename to server/src/test/java/com/genymobile/scrcpy/model/SizeTest.java
index 954fcf9c..db8588f6 100644
--- a/server/src/test/java/com/genymobile/scrcpy/device/SizeTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/model/SizeTest.java
@@ -1,4 +1,4 @@
-package com.genymobile.scrcpy.device;
+package com.genymobile.scrcpy.model;
import com.genymobile.scrcpy.video.VideoConstraints;
diff --git a/server/src/test/java/com/genymobile/scrcpy/util/CommandParserTest.java b/server/src/test/java/com/genymobile/scrcpy/util/CommandParserTest.java
index 7e1d55b5..e690b3da 100644
--- a/server/src/test/java/com/genymobile/scrcpy/util/CommandParserTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/util/CommandParserTest.java
@@ -1,6 +1,6 @@
package com.genymobile.scrcpy.util;
-import com.genymobile.scrcpy.device.DisplayInfo;
+import com.genymobile.scrcpy.display.DisplayInfo;
import com.genymobile.scrcpy.wrappers.DisplayManager;
import android.view.Display;