diff --git a/.gitignore b/.gitignore
index 76af3d4a..59bc840d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
-build
-/dist
+build/
+/dist/
+.idea/
+.gradle/
diff --git a/Makefile b/Makefile
index 0bb360a4..97e3c5d4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 .PHONY: default release clean build-app build-server dist dist-zip sums test
 
-BUILD_DIR := build
+GRADLE ?= ./gradlew
+
+APP_BUILD_DIR := app-build
 DIST := dist
 TARGET_DIR := scrcpy
 
@@ -13,21 +15,21 @@ default:
 release: clean dist-zip sums
 
 clean:
-	rm -rf "$(BUILD_DIR)" "$(DIST)"
-	+$(MAKE) -C server clean
+	$(GRADLE) clean
+	rm -rf "$(APP_BUILD_DIR)" "$(DIST)"
 
 build-app:
-	[ -d "$(BUILD_DIR)" ] || ( mkdir "$(BUILD_DIR)" && meson app "$(BUILD_DIR)" --buildtype release )
-	ninja -C "$(BUILD_DIR)"
+	[ -d "$(APP_BUILD_DIR)" ] || ( mkdir "$(APP_BUILD_DIR)" && meson app "$(APP_BUILD_DIR)" --buildtype release )
+	ninja -C "$(APP_BUILD_DIR)"
 
 build-server:
-	+$(MAKE) -C server clean
-	+$(MAKE) -C server jar
+	$(GRADLE) assembleRelease
 
-dist: build-app build-server
+dist: build-server build-app
 	mkdir -p "$(DIST)/$(TARGET_DIR)"
-	cp server/scrcpy-server.jar "$(DIST)/$(TARGET_DIR)/"
-	cp build/scrcpy "$(DIST)/$(TARGET_DIR)/"
+	# no need to sign the APK, we dont "install" it
+	cp server/build/outputs/apk/release/server-release-unsigned.apk "$(DIST)/$(TARGET_DIR)/scrcpy.apk"
+	cp $(APP_BUILD_DIR)/scrcpy "$(DIST)/$(TARGET_DIR)/"
 
 dist-zip: dist
 	cd "$(DIST)"; \
@@ -38,5 +40,5 @@ sums:
 		sha256sum *.zip > SHA256SUM.txt
 
 test:
-	+$(MAKE) -C server test
-	ninja -C "$(BUILD_DIR)" test
+	$(GRADLE) test
+	ninja -C "$(APP_BUILD_DIR)" test
diff --git a/app/src/server.c b/app/src/server.c
index 1b752166..a23c45d7 100644
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -6,11 +6,11 @@
 #define SOCKET_NAME "scrcpy"
 
 process_t push_server(const char *serial) {
-    const char *server_jar_path = getenv("SCRCPY_SERVER_JAR");
-    if (!server_jar_path) {
-        server_jar_path = "scrcpy-server.jar";
+    const char *apk_path = getenv("SCRCPY_APK");
+    if (!apk_path) {
+        apk_path = "scrcpy.apk";
     }
-    return adb_push(serial, server_jar_path, "/data/local/tmp/");
+    return adb_push(serial, apk_path, "/data/local/tmp/");
 }
 
 process_t enable_tunnel(const char *serial, Uint16 local_port) {
@@ -26,9 +26,9 @@ process_t start_server(const char *serial, Uint16 maximum_size) {
     sprintf(maximum_size_string, "%d", maximum_size);
     const char *const cmd[] = {
         "shell",
-        "CLASSPATH=/data/local/tmp/scrcpy-server.jar",
+        "CLASSPATH=/data/local/tmp/scrcpy.apk",
         "app_process",
-        "/system/bin",
+        "/", // unused
         "com.genymobile.scrcpy.ScrCpyServer",
         maximum_size_string,
     };
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..fbdb9f10
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,26 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.0.1'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..aac7c9b4
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,17 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..13372aef
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..1f32c6ad
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Jan 29 16:38:49 CET 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 00000000..9d82f789
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 00000000..aec99730
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/server/.gitignore b/server/.gitignore
index e5f088ef..0df7064d 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -1,4 +1,8 @@
-*.class
-*.jar
-*.dex
-/gen
+*.iml
+.gradle
+/local.properties
+/.idea/
+.DS_Store
+/build
+/captures
+.externalNativeBuild
diff --git a/server/Makefile b/server/Makefile
deleted file mode 100644
index af9e3a64..00000000
--- a/server/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-.PHONY: jar push run clean compile compiletests test
-
-SRC_DIR := src
-GEN_DIR := gen
-CLS_DIR := classes
-CLS_DEX := classes.dex
-TEST_SRC_DIR := tests
-TEST_CLS_DIR := test_classes
-TEST_LIBS := /usr/share/java/junit4.jar:/usr/share/java/hamcrest-core.jar
-
-BUILD_TOOLS := $(ANDROID_HOME)/build-tools/26.0.2
-AIDL := $(BUILD_TOOLS)/aidl
-ifeq ($(OS),Windows_NT)
-	DX := $(BUILD_TOOLS)/dx.bat
-else
-	DX := $(BUILD_TOOLS)/dx
-endif
-
-ANDROID_JAR := $(ANDROID_HOME)/platforms/android-26/android.jar
-
-AIDL_SRC := android/view/IRotationWatcher.aidl
-SRC := com/genymobile/scrcpy/ScrCpyServer.java \
-	com/genymobile/scrcpy/ControlEvent.java \
-	com/genymobile/scrcpy/ControlEventReader.java \
-	com/genymobile/scrcpy/DesktopConnection.java \
-	com/genymobile/scrcpy/Device.java \
-	com/genymobile/scrcpy/DisplayInfo.java \
-	com/genymobile/scrcpy/EventController.java \
-	com/genymobile/scrcpy/Ln.java \
-	com/genymobile/scrcpy/Options.java \
-	com/genymobile/scrcpy/Point.java \
-	com/genymobile/scrcpy/Position.java \
-	com/genymobile/scrcpy/ScreenInfo.java \
-	com/genymobile/scrcpy/ScreenStreamer.java \
-	com/genymobile/scrcpy/ScreenStreamerSession.java \
-	com/genymobile/scrcpy/Size.java \
-	com/genymobile/scrcpy/wrappers/DisplayManager.java \
-	com/genymobile/scrcpy/wrappers/InputManager.java \
-	com/genymobile/scrcpy/wrappers/ServiceManager.java \
-	com/genymobile/scrcpy/wrappers/WindowManager.java \
-
-TEST_SRC := com/genymobile/scrcpy/ControlEventReaderTest.java \
-
-# generate classnames from filepath
-TEST_CLS := $(subst /,.,$(basename $(TEST_SRC)))
-
-JAR := scrcpy-server.jar
-MAIN := com.genymobile.scrcpy.ScrCpyServer
-
-AIDL_GEN := $(AIDL_SRC:%.aidl=$(GEN_DIR)/%.java)
-AIDL_CLS := $(AIDL_SRC:%.aidl=$(CLS_DIR)/%.class)
-SRC_CLS := $(SRC:%.java=$(CLS_DIR)/%.class)
-CLS := $(AIDL_CLS) $(SRC_CLS)
-
-ALL_JAVA := $(AIDL_GEN) $(addprefix $(SRC_DIR)/,$(SRC))
-ALL_TESTS := $(addprefix $(TEST_SRC_DIR)/,$(TEST_SRC))
-
-jar: $(JAR)
-
-$(AIDL_GEN): $(GEN_DIR)/%.java : $(SRC_DIR)/%.aidl
-	mkdir -p $(GEN_DIR)
-	"$(AIDL)" -o$(GEN_DIR) $(SRC_DIR)/$(AIDL_SRC)
-
-compile: $(ALL_JAVA)
-	@mkdir -p "$(CLS_DIR)"
-	javac -source 1.7 -target 1.7 \
-		-cp "$(ANDROID_JAR)" \
-		-d "$(CLS_DIR)" -sourcepath $(SRC_DIR):$(GEN_DIR) \
-		$(ALL_JAVA)
-
-$(JAR): $(ALL_JAVA)
-	# we cannot track easily class dependencies, so execute compile only when jar is outdated
-	+$(MAKE) compile
-	"$(DX)" --dex --output=$(CLS_DEX) $(CLS_DIR)
-	jar cvf $(JAR) classes.dex
-
-push: jar
-	adb push $(JAR) /data/local/tmp/
-
-run: push
-	adb shell "CLASSPATH=/data/local/tmp/$(JAR) app_process /system/bin $(MAIN)"
-
-clean:
-	rm -rf $(CLS_DEX) $(CLS_DIR) $(GEN_DIR) $(JAR) $(TEST_CLS_DIR)
-
-compiletests: compile $(ALL_TESTS)
-	@mkdir -p "$(TEST_CLS_DIR)"
-	javac -cp "$(TEST_LIBS):$(ANDROID_JAR):$(CLS_DIR)" -d "$(TEST_CLS_DIR)" -sourcepath "$(TEST_SRC_DIR)" $(ALL_TESTS)
-
-test:
-	+$(MAKE) compiletests
-	java -cp "$(TEST_LIBS):$(ANDROID_JAR):$(CLS_DIR):$(TEST_CLS_DIR)" org.junit.runner.JUnitCore $(TEST_CLS)
diff --git a/server/build.gradle b/server/build.gradle
new file mode 100644
index 00000000..26ae1951
--- /dev/null
+++ b/server/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 26
+    defaultConfig {
+        applicationId "com.genymobile.scrcpy"
+        minSdkVersion 21
+        targetSdkVersion 26
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.1'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+}
diff --git a/server/proguard-rules.pro b/server/proguard-rules.pro
new file mode 100644
index 00000000..f1b42451
--- /dev/null
+++ b/server/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/server/src/main/AndroidManifest.xml b/server/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..ccd69d2f
--- /dev/null
+++ b/server/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<!-- not a real Android application, it is run by app_process manually -->
+<manifest package="com.genymobile.scrcpy"/>
diff --git a/server/src/android/view/IRotationWatcher.aidl b/server/src/main/aidl/android/view/IRotationWatcher.aidl
similarity index 90%
rename from server/src/android/view/IRotationWatcher.aidl
rename to server/src/main/aidl/android/view/IRotationWatcher.aidl
index 2c83642f..2cc5e44a 100644
--- a/server/src/android/view/IRotationWatcher.aidl
+++ b/server/src/main/aidl/android/view/IRotationWatcher.aidl
@@ -20,6 +20,6 @@ package android.view;
 /**
  * {@hide}
  */
-oneway interface IRotationWatcher {
-    void onRotationChanged(int rotation);
+interface IRotationWatcher {
+    oneway void onRotationChanged(int rotation);
 }
diff --git a/server/src/com/genymobile/scrcpy/ControlEvent.java b/server/src/main/java/com/genymobile/scrcpy/ControlEvent.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/ControlEvent.java
rename to server/src/main/java/com/genymobile/scrcpy/ControlEvent.java
diff --git a/server/src/com/genymobile/scrcpy/ControlEventReader.java b/server/src/main/java/com/genymobile/scrcpy/ControlEventReader.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/ControlEventReader.java
rename to server/src/main/java/com/genymobile/scrcpy/ControlEventReader.java
diff --git a/server/src/com/genymobile/scrcpy/DesktopConnection.java b/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/DesktopConnection.java
rename to server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java
diff --git a/server/src/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/Device.java
similarity index 90%
rename from server/src/com/genymobile/scrcpy/Device.java
rename to server/src/main/java/com/genymobile/scrcpy/Device.java
index baecf06e..9e6b568f 100644
--- a/server/src/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -40,6 +40,12 @@ public final class Device {
     }
 
     private ScreenInfo computeScreenInfo(int maximumSize) {
+        // Compute the video size and the padding of the content inside this video.
+        // Principle:
+        // - scale down the great side of the screen to maximumSize (if necessary);
+        // - scale down the other side so that the aspect ratio is preserved;
+        // - ceil this value to the next multiple of 8 (H.264 only accepts multiples of 8)
+        // - this may introduce black bands, so store the padding (typically a few pixels)
         DisplayInfo displayInfo = serviceManager.getDisplayManager().getDisplayInfo();
         boolean rotated = (displayInfo.getRotation() & 1) != 0;
         Size deviceSize = displayInfo.getSize();
diff --git a/server/src/com/genymobile/scrcpy/DisplayInfo.java b/server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/DisplayInfo.java
rename to server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java
diff --git a/server/src/com/genymobile/scrcpy/EventController.java b/server/src/main/java/com/genymobile/scrcpy/EventController.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/EventController.java
rename to server/src/main/java/com/genymobile/scrcpy/EventController.java
diff --git a/server/src/com/genymobile/scrcpy/Ln.java b/server/src/main/java/com/genymobile/scrcpy/Ln.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/Ln.java
rename to server/src/main/java/com/genymobile/scrcpy/Ln.java
diff --git a/server/src/com/genymobile/scrcpy/Options.java b/server/src/main/java/com/genymobile/scrcpy/Options.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/Options.java
rename to server/src/main/java/com/genymobile/scrcpy/Options.java
diff --git a/server/src/com/genymobile/scrcpy/Point.java b/server/src/main/java/com/genymobile/scrcpy/Point.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/Point.java
rename to server/src/main/java/com/genymobile/scrcpy/Point.java
diff --git a/server/src/com/genymobile/scrcpy/Position.java b/server/src/main/java/com/genymobile/scrcpy/Position.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/Position.java
rename to server/src/main/java/com/genymobile/scrcpy/Position.java
diff --git a/server/src/com/genymobile/scrcpy/ScrCpyServer.java b/server/src/main/java/com/genymobile/scrcpy/ScrCpyServer.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/ScrCpyServer.java
rename to server/src/main/java/com/genymobile/scrcpy/ScrCpyServer.java
diff --git a/server/src/com/genymobile/scrcpy/ScreenInfo.java b/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/ScreenInfo.java
rename to server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java
diff --git a/server/src/com/genymobile/scrcpy/ScreenStreamer.java b/server/src/main/java/com/genymobile/scrcpy/ScreenStreamer.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/ScreenStreamer.java
rename to server/src/main/java/com/genymobile/scrcpy/ScreenStreamer.java
diff --git a/server/src/com/genymobile/scrcpy/ScreenStreamerSession.java b/server/src/main/java/com/genymobile/scrcpy/ScreenStreamerSession.java
similarity index 94%
rename from server/src/com/genymobile/scrcpy/ScreenStreamerSession.java
rename to server/src/main/java/com/genymobile/scrcpy/ScreenStreamerSession.java
index 9ab0365a..cb3c7bb1 100644
--- a/server/src/com/genymobile/scrcpy/ScreenStreamerSession.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenStreamerSession.java
@@ -53,9 +53,7 @@ public class ScreenStreamerSession {
         List<String> command = new ArrayList<>();
         command.add("screenrecord");
         command.add("--output-format=h264");
-        if (videoSize != null) {
-            command.add("--size=" + videoSize.getWidth() + "x" + videoSize.getHeight());
-        }
+        command.add("--size=" + videoSize.getWidth() + "x" + videoSize.getHeight());
         command.add("-");
         Process process = new ProcessBuilder(command).start();
         process.getOutputStream().close();
diff --git a/server/src/com/genymobile/scrcpy/Size.java b/server/src/main/java/com/genymobile/scrcpy/Size.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/Size.java
rename to server/src/main/java/com/genymobile/scrcpy/Size.java
diff --git a/server/src/com/genymobile/scrcpy/wrappers/DisplayManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/wrappers/DisplayManager.java
rename to server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
diff --git a/server/src/com/genymobile/scrcpy/wrappers/InputManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/wrappers/InputManager.java
rename to server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
diff --git a/server/src/com/genymobile/scrcpy/wrappers/ServiceManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/wrappers/ServiceManager.java
rename to server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
diff --git a/server/src/com/genymobile/scrcpy/wrappers/WindowManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
similarity index 100%
rename from server/src/com/genymobile/scrcpy/wrappers/WindowManager.java
rename to server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
diff --git a/server/tests/com/genymobile/scrcpy/ControlEventReaderTest.java b/server/src/test/java/com/genymobile/scrcpy/ControlEventReaderTest.java
similarity index 100%
rename from server/tests/com/genymobile/scrcpy/ControlEventReaderTest.java
rename to server/src/test/java/com/genymobile/scrcpy/ControlEventReaderTest.java
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..8f51035f
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':server'