diff --git a/QtScrcpy/QtScrcpy.pro b/QtScrcpy/QtScrcpy.pro
index e5546d6..865f7c1 100644
--- a/QtScrcpy/QtScrcpy.pro
+++ b/QtScrcpy/QtScrcpy.pro
@@ -23,13 +23,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
-#DEFINES += SKIP_FRAMES
-#DEFINES += USE_QTQUICK
-
-contains(DEFINES, USE_QTQUICK) {
-    QT += quickwidgets
-}
-
 # 源码
 SOURCES += \
         main.cpp \
@@ -43,38 +36,19 @@ FORMS += \
 
 # 子工程
 include ($$PWD/common/common.pri)
-include ($$PWD/server/server.pri)
 include ($$PWD/adb/adb.pri)
-include ($$PWD/decoder/decoder.pri)
-include ($$PWD/render/render.pri)
-include ($$PWD/stream/stream.pri)
-include ($$PWD/android/android.pri)
-include ($$PWD/controller/controller.pri)
 include ($$PWD/uibase/uibase.pri)
 include ($$PWD/fontawesome/fontawesome.pri)
-include ($$PWD/filehandler/filehandler.pri)
-include ($$PWD/recorder/recorder.pri)
 include ($$PWD/util/util.pri)
 include ($$PWD/device/device.pri)
-include ($$PWD/ui/ui.pri)
 
 # 附加包含路径
 INCLUDEPATH += \
-        $$PWD/../third_party/ffmpeg/include \
-        $$PWD/common \
-        $$PWD/server \
-        $$PWD/adb \
-        $$PWD/decoder \
-        $$PWD/render \
-        $$PWD/stream \
-        $$PWD/android \
-        $$PWD/controller \
-        $$PWD/uibase \
-        $$PWD/filehandler \
-        $$PWD/recorder \
+        $$PWD/common \        
+        $$PWD/adb \        
+        $$PWD/uibase \        
         $$PWD/util \
-        $$PWD/device \
-        $$PWD/ui \
+        $$PWD/device \        
         $$PWD/fontawesome
 
 
diff --git a/QtScrcpy/android/android.pri b/QtScrcpy/device/android/android.pri
similarity index 100%
rename from QtScrcpy/android/android.pri
rename to QtScrcpy/device/android/android.pri
diff --git a/QtScrcpy/android/input.h b/QtScrcpy/device/android/input.h
similarity index 100%
rename from QtScrcpy/android/input.h
rename to QtScrcpy/device/android/input.h
diff --git a/QtScrcpy/android/keycodes.h b/QtScrcpy/device/android/keycodes.h
similarity index 100%
rename from QtScrcpy/android/keycodes.h
rename to QtScrcpy/device/android/keycodes.h
diff --git a/QtScrcpy/controller/controller.cpp b/QtScrcpy/device/controller/controller.cpp
similarity index 100%
rename from QtScrcpy/controller/controller.cpp
rename to QtScrcpy/device/controller/controller.cpp
diff --git a/QtScrcpy/controller/controller.h b/QtScrcpy/device/controller/controller.h
similarity index 100%
rename from QtScrcpy/controller/controller.h
rename to QtScrcpy/device/controller/controller.h
diff --git a/QtScrcpy/controller/controller.pri b/QtScrcpy/device/controller/controller.pri
similarity index 100%
rename from QtScrcpy/controller/controller.pri
rename to QtScrcpy/device/controller/controller.pri
diff --git a/QtScrcpy/controller/inputconvert/controlmsg.cpp b/QtScrcpy/device/controller/inputconvert/controlmsg.cpp
similarity index 100%
rename from QtScrcpy/controller/inputconvert/controlmsg.cpp
rename to QtScrcpy/device/controller/inputconvert/controlmsg.cpp
diff --git a/QtScrcpy/controller/inputconvert/controlmsg.h b/QtScrcpy/device/controller/inputconvert/controlmsg.h
similarity index 100%
rename from QtScrcpy/controller/inputconvert/controlmsg.h
rename to QtScrcpy/device/controller/inputconvert/controlmsg.h
diff --git a/QtScrcpy/controller/inputconvert/inputconvert.pri b/QtScrcpy/device/controller/inputconvert/inputconvert.pri
similarity index 100%
rename from QtScrcpy/controller/inputconvert/inputconvert.pri
rename to QtScrcpy/device/controller/inputconvert/inputconvert.pri
diff --git a/QtScrcpy/controller/inputconvert/inputconvertbase.cpp b/QtScrcpy/device/controller/inputconvert/inputconvertbase.cpp
similarity index 100%
rename from QtScrcpy/controller/inputconvert/inputconvertbase.cpp
rename to QtScrcpy/device/controller/inputconvert/inputconvertbase.cpp
diff --git a/QtScrcpy/controller/inputconvert/inputconvertbase.h b/QtScrcpy/device/controller/inputconvert/inputconvertbase.h
similarity index 100%
rename from QtScrcpy/controller/inputconvert/inputconvertbase.h
rename to QtScrcpy/device/controller/inputconvert/inputconvertbase.h
diff --git a/QtScrcpy/controller/inputconvert/inputconvertgame.cpp b/QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp
similarity index 100%
rename from QtScrcpy/controller/inputconvert/inputconvertgame.cpp
rename to QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp
diff --git a/QtScrcpy/controller/inputconvert/inputconvertgame.h b/QtScrcpy/device/controller/inputconvert/inputconvertgame.h
similarity index 100%
rename from QtScrcpy/controller/inputconvert/inputconvertgame.h
rename to QtScrcpy/device/controller/inputconvert/inputconvertgame.h
diff --git a/QtScrcpy/controller/inputconvert/inputconvertnormal.cpp b/QtScrcpy/device/controller/inputconvert/inputconvertnormal.cpp
similarity index 100%
rename from QtScrcpy/controller/inputconvert/inputconvertnormal.cpp
rename to QtScrcpy/device/controller/inputconvert/inputconvertnormal.cpp
diff --git a/QtScrcpy/controller/inputconvert/inputconvertnormal.h b/QtScrcpy/device/controller/inputconvert/inputconvertnormal.h
similarity index 100%
rename from QtScrcpy/controller/inputconvert/inputconvertnormal.h
rename to QtScrcpy/device/controller/inputconvert/inputconvertnormal.h
diff --git a/QtScrcpy/controller/receiver/devicemsg.cpp b/QtScrcpy/device/controller/receiver/devicemsg.cpp
similarity index 100%
rename from QtScrcpy/controller/receiver/devicemsg.cpp
rename to QtScrcpy/device/controller/receiver/devicemsg.cpp
diff --git a/QtScrcpy/controller/receiver/devicemsg.h b/QtScrcpy/device/controller/receiver/devicemsg.h
similarity index 100%
rename from QtScrcpy/controller/receiver/devicemsg.h
rename to QtScrcpy/device/controller/receiver/devicemsg.h
diff --git a/QtScrcpy/controller/receiver/receiver.cpp b/QtScrcpy/device/controller/receiver/receiver.cpp
similarity index 100%
rename from QtScrcpy/controller/receiver/receiver.cpp
rename to QtScrcpy/device/controller/receiver/receiver.cpp
diff --git a/QtScrcpy/controller/receiver/receiver.h b/QtScrcpy/device/controller/receiver/receiver.h
similarity index 100%
rename from QtScrcpy/controller/receiver/receiver.h
rename to QtScrcpy/device/controller/receiver/receiver.h
diff --git a/QtScrcpy/controller/receiver/receiver.pri b/QtScrcpy/device/controller/receiver/receiver.pri
similarity index 100%
rename from QtScrcpy/controller/receiver/receiver.pri
rename to QtScrcpy/device/controller/receiver/receiver.pri
diff --git a/QtScrcpy/decoder/avframeconvert.cpp b/QtScrcpy/device/decoder/avframeconvert.cpp
similarity index 100%
rename from QtScrcpy/decoder/avframeconvert.cpp
rename to QtScrcpy/device/decoder/avframeconvert.cpp
diff --git a/QtScrcpy/decoder/avframeconvert.h b/QtScrcpy/device/decoder/avframeconvert.h
similarity index 100%
rename from QtScrcpy/decoder/avframeconvert.h
rename to QtScrcpy/device/decoder/avframeconvert.h
diff --git a/QtScrcpy/decoder/decoder.cpp b/QtScrcpy/device/decoder/decoder.cpp
similarity index 100%
rename from QtScrcpy/decoder/decoder.cpp
rename to QtScrcpy/device/decoder/decoder.cpp
diff --git a/QtScrcpy/decoder/decoder.h b/QtScrcpy/device/decoder/decoder.h
similarity index 100%
rename from QtScrcpy/decoder/decoder.h
rename to QtScrcpy/device/decoder/decoder.h
diff --git a/QtScrcpy/decoder/decoder.pri b/QtScrcpy/device/decoder/decoder.pri
similarity index 90%
rename from QtScrcpy/decoder/decoder.pri
rename to QtScrcpy/device/decoder/decoder.pri
index 5e124fe..d5366e7 100644
--- a/QtScrcpy/decoder/decoder.pri
+++ b/QtScrcpy/device/decoder/decoder.pri
@@ -10,3 +10,5 @@ SOURCES += \
     $$PWD/avframeconvert.cpp \
     $$PWD/videobuffer.cpp
 
+#DEFINES += SKIP_FRAMES
+
diff --git a/QtScrcpy/decoder/fpscounter.cpp b/QtScrcpy/device/decoder/fpscounter.cpp
similarity index 100%
rename from QtScrcpy/decoder/fpscounter.cpp
rename to QtScrcpy/device/decoder/fpscounter.cpp
diff --git a/QtScrcpy/decoder/fpscounter.h b/QtScrcpy/device/decoder/fpscounter.h
similarity index 100%
rename from QtScrcpy/decoder/fpscounter.h
rename to QtScrcpy/device/decoder/fpscounter.h
diff --git a/QtScrcpy/decoder/videobuffer.cpp b/QtScrcpy/device/decoder/videobuffer.cpp
similarity index 100%
rename from QtScrcpy/decoder/videobuffer.cpp
rename to QtScrcpy/device/decoder/videobuffer.cpp
diff --git a/QtScrcpy/decoder/videobuffer.h b/QtScrcpy/device/decoder/videobuffer.h
similarity index 100%
rename from QtScrcpy/decoder/videobuffer.h
rename to QtScrcpy/device/decoder/videobuffer.h
diff --git a/QtScrcpy/device/device.cpp b/QtScrcpy/device/device.cpp
index 7b9a8ce..a8e1e0f 100644
--- a/QtScrcpy/device/device.cpp
+++ b/QtScrcpy/device/device.cpp
@@ -64,6 +64,11 @@ VideoForm *Device::getVideoForm()
     return m_videoForm;
 }
 
+Controller *Device::getController()
+{
+    return m_controller;
+}
+
 void Device::initSignals()
 {
     if (m_videoForm) {
diff --git a/QtScrcpy/device/device.h b/QtScrcpy/device/device.h
index 7418002..1ea9bd2 100644
--- a/QtScrcpy/device/device.h
+++ b/QtScrcpy/device/device.h
@@ -29,6 +29,7 @@ public:
     virtual ~Device();
 
     VideoForm *getVideoForm();
+    Controller* getController();
 
 private:
     void initSignals();
diff --git a/QtScrcpy/device/device.pri b/QtScrcpy/device/device.pri
index 19e5f7e..e31bd3c 100644
--- a/QtScrcpy/device/device.pri
+++ b/QtScrcpy/device/device.pri
@@ -3,3 +3,25 @@ HEADERS += \
 
 SOURCES += \
     $$PWD/device.cpp
+
+include ($$PWD/server/server.pri)
+include ($$PWD/decoder/decoder.pri)
+include ($$PWD/render/render.pri)
+include ($$PWD/stream/stream.pri)
+include ($$PWD/android/android.pri)
+include ($$PWD/controller/controller.pri)
+include ($$PWD/filehandler/filehandler.pri)
+include ($$PWD/recorder/recorder.pri)
+include ($$PWD/ui/ui.pri)
+
+INCLUDEPATH += \
+        $$PWD/../../third_party/ffmpeg/include \
+        $$PWD/server \
+        $$PWD/decoder \
+        $$PWD/render \
+        $$PWD/stream \
+        $$PWD/android \
+        $$PWD/controller \
+        $$PWD/filehandler \
+        $$PWD/recorder \
+        $$PWD/ui
diff --git a/QtScrcpy/filehandler/filehandler.cpp b/QtScrcpy/device/filehandler/filehandler.cpp
similarity index 100%
rename from QtScrcpy/filehandler/filehandler.cpp
rename to QtScrcpy/device/filehandler/filehandler.cpp
diff --git a/QtScrcpy/filehandler/filehandler.h b/QtScrcpy/device/filehandler/filehandler.h
similarity index 100%
rename from QtScrcpy/filehandler/filehandler.h
rename to QtScrcpy/device/filehandler/filehandler.h
diff --git a/QtScrcpy/filehandler/filehandler.pri b/QtScrcpy/device/filehandler/filehandler.pri
similarity index 100%
rename from QtScrcpy/filehandler/filehandler.pri
rename to QtScrcpy/device/filehandler/filehandler.pri
diff --git a/QtScrcpy/recorder/recorder.cpp b/QtScrcpy/device/recorder/recorder.cpp
similarity index 100%
rename from QtScrcpy/recorder/recorder.cpp
rename to QtScrcpy/device/recorder/recorder.cpp
diff --git a/QtScrcpy/recorder/recorder.h b/QtScrcpy/device/recorder/recorder.h
similarity index 100%
rename from QtScrcpy/recorder/recorder.h
rename to QtScrcpy/device/recorder/recorder.h
diff --git a/QtScrcpy/recorder/recorder.pri b/QtScrcpy/device/recorder/recorder.pri
similarity index 100%
rename from QtScrcpy/recorder/recorder.pri
rename to QtScrcpy/device/recorder/recorder.pri
diff --git a/QtScrcpy/render/qyuvopenglwidget.cpp b/QtScrcpy/device/render/qyuvopenglwidget.cpp
similarity index 100%
rename from QtScrcpy/render/qyuvopenglwidget.cpp
rename to QtScrcpy/device/render/qyuvopenglwidget.cpp
diff --git a/QtScrcpy/render/qyuvopenglwidget.h b/QtScrcpy/device/render/qyuvopenglwidget.h
similarity index 100%
rename from QtScrcpy/render/qyuvopenglwidget.h
rename to QtScrcpy/device/render/qyuvopenglwidget.h
diff --git a/QtScrcpy/render/render.pri b/QtScrcpy/device/render/render.pri
similarity index 100%
rename from QtScrcpy/render/render.pri
rename to QtScrcpy/device/render/render.pri
diff --git a/QtScrcpy/server/server.cpp b/QtScrcpy/device/server/server.cpp
similarity index 100%
rename from QtScrcpy/server/server.cpp
rename to QtScrcpy/device/server/server.cpp
diff --git a/QtScrcpy/server/server.h b/QtScrcpy/device/server/server.h
similarity index 100%
rename from QtScrcpy/server/server.h
rename to QtScrcpy/device/server/server.h
diff --git a/QtScrcpy/server/server.pri b/QtScrcpy/device/server/server.pri
similarity index 100%
rename from QtScrcpy/server/server.pri
rename to QtScrcpy/device/server/server.pri
diff --git a/QtScrcpy/server/tcpserver.cpp b/QtScrcpy/device/server/tcpserver.cpp
similarity index 100%
rename from QtScrcpy/server/tcpserver.cpp
rename to QtScrcpy/device/server/tcpserver.cpp
diff --git a/QtScrcpy/server/tcpserver.h b/QtScrcpy/device/server/tcpserver.h
similarity index 100%
rename from QtScrcpy/server/tcpserver.h
rename to QtScrcpy/device/server/tcpserver.h
diff --git a/QtScrcpy/server/videosocket.cpp b/QtScrcpy/device/server/videosocket.cpp
similarity index 100%
rename from QtScrcpy/server/videosocket.cpp
rename to QtScrcpy/device/server/videosocket.cpp
diff --git a/QtScrcpy/server/videosocket.h b/QtScrcpy/device/server/videosocket.h
similarity index 100%
rename from QtScrcpy/server/videosocket.h
rename to QtScrcpy/device/server/videosocket.h
diff --git a/QtScrcpy/stream/stream.cpp b/QtScrcpy/device/stream/stream.cpp
similarity index 100%
rename from QtScrcpy/stream/stream.cpp
rename to QtScrcpy/device/stream/stream.cpp
diff --git a/QtScrcpy/stream/stream.h b/QtScrcpy/device/stream/stream.h
similarity index 100%
rename from QtScrcpy/stream/stream.h
rename to QtScrcpy/device/stream/stream.h
diff --git a/QtScrcpy/stream/stream.pri b/QtScrcpy/device/stream/stream.pri
similarity index 100%
rename from QtScrcpy/stream/stream.pri
rename to QtScrcpy/device/stream/stream.pri
diff --git a/QtScrcpy/ui/toolform.cpp b/QtScrcpy/device/ui/toolform.cpp
similarity index 100%
rename from QtScrcpy/ui/toolform.cpp
rename to QtScrcpy/device/ui/toolform.cpp
diff --git a/QtScrcpy/ui/toolform.h b/QtScrcpy/device/ui/toolform.h
similarity index 100%
rename from QtScrcpy/ui/toolform.h
rename to QtScrcpy/device/ui/toolform.h
diff --git a/QtScrcpy/ui/toolform.ui b/QtScrcpy/device/ui/toolform.ui
similarity index 100%
rename from QtScrcpy/ui/toolform.ui
rename to QtScrcpy/device/ui/toolform.ui
diff --git a/QtScrcpy/ui/ui.pri b/QtScrcpy/device/ui/ui.pri
similarity index 68%
rename from QtScrcpy/ui/ui.pri
rename to QtScrcpy/device/ui/ui.pri
index b9854b3..d67a3f9 100644
--- a/QtScrcpy/ui/ui.pri
+++ b/QtScrcpy/device/ui/ui.pri
@@ -9,3 +9,9 @@ HEADERS += \
 FORMS += \
     $$PWD/videoform.ui \
     $$PWD/toolform.ui
+
+#DEFINES += USE_QTQUICK
+
+contains(DEFINES, USE_QTQUICK) {
+    QT += quickwidgets
+}
diff --git a/QtScrcpy/ui/videoform.cpp b/QtScrcpy/device/ui/videoform.cpp
similarity index 100%
rename from QtScrcpy/ui/videoform.cpp
rename to QtScrcpy/device/ui/videoform.cpp
diff --git a/QtScrcpy/ui/videoform.h b/QtScrcpy/device/ui/videoform.h
similarity index 100%
rename from QtScrcpy/ui/videoform.h
rename to QtScrcpy/device/ui/videoform.h
diff --git a/QtScrcpy/ui/videoform.ui b/QtScrcpy/device/ui/videoform.ui
similarity index 100%
rename from QtScrcpy/ui/videoform.ui
rename to QtScrcpy/device/ui/videoform.ui
diff --git a/QtScrcpy/dialog.cpp b/QtScrcpy/dialog.cpp
index 3487540..0d9fb39 100644
--- a/QtScrcpy/dialog.cpp
+++ b/QtScrcpy/dialog.cpp
@@ -253,8 +253,8 @@ void Dialog::on_closeScreenCheck_stateChanged(int arg1)
         return;
     }
     if (ui->closeScreenCheck->isChecked()) {
-        m_device->getVideoForm()->getController()->setScreenPowerMode(ControlMsg::SPM_OFF);
+        m_device->getController()->setScreenPowerMode(ControlMsg::SPM_OFF);
     } else {
-        m_device->getVideoForm()->getController()->setScreenPowerMode(ControlMsg::SPM_NORMAL);
+        m_device->getController()->setScreenPowerMode(ControlMsg::SPM_NORMAL);
     }
 }