diff --git a/client.pro b/client.pro
index f781113c1..5fe70117d 100644
--- a/client.pro
+++ b/client.pro
@@ -20,7 +20,7 @@ contains(BLACK_CONFIG, BlackSim) {
 
     contains(BLACK_CONFIG, XPlane) {
         SUBDIRS += src/blacksim/xplane/xbus/xbus.pro
-        SUBDIRS += src/blacksim/xplane/plugin/plugin_xplane.pro
+        SUBDIRS += src/plugins/simulator/xplane/plugin_xplane.pro
     }
 }
 
diff --git a/src/blacksim/blacksim.pro b/src/blacksim/blacksim.pro
index 0892d6a2b..0b1ff3b58 100644
--- a/src/blacksim/blacksim.pro
+++ b/src/blacksim/blacksim.pro
@@ -31,11 +31,6 @@ SOURCES += $$PWD/fscommon/*.cpp
 HEADERS += $$PWD/fsx/*.h
 SOURCES += $$PWD/fsx/*.cpp
 
-contains(BLACK_CONFIG, XPlane) {
-	HEADERS += $$PWD/xplane/plugin/*.h
-	SOURCES += $$PWD/xplane/plugin/*.cpp
-}
-
 DESTDIR = ../../lib
 
 include (../../libraries.pri)
diff --git a/src/blacksim/xplane/plugin/plugin_xplane.pro b/src/plugins/simulator/xplane/plugin_xplane.pro
similarity index 89%
rename from src/blacksim/xplane/plugin/plugin_xplane.pro
rename to src/plugins/simulator/xplane/plugin_xplane.pro
index 435c52325..870d6140b 100644
--- a/src/blacksim/xplane/plugin/plugin_xplane.pro
+++ b/src/plugins/simulator/xplane/plugin_xplane.pro
@@ -17,6 +17,6 @@ HEADERS += *.h
 
 #win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib
 
-DESTDIR = ../../../../bin/plugins
+DESTDIR = ../../../../bin/plugins/simulator
 
 include (../../../../libraries.pri)
diff --git a/src/blacksim/xplane/plugin/stub.cpp b/src/plugins/simulator/xplane/stub.cpp
similarity index 100%
rename from src/blacksim/xplane/plugin/stub.cpp
rename to src/plugins/simulator/xplane/stub.cpp
diff --git a/src/blacksim/xplane/plugin/stub.h b/src/plugins/simulator/xplane/stub.h
similarity index 100%
rename from src/blacksim/xplane/plugin/stub.h
rename to src/plugins/simulator/xplane/stub.h