diff --git a/src/FactSystem/CMakeLists.txt b/src/FactSystem/CMakeLists.txt
index 6b7f1999bc1e9bb1f106ac5338a23934d0f8f1cf..24bc8ccf84af55db547a7b38fe582b2b25f87f38 100644
--- a/src/FactSystem/CMakeLists.txt
+++ b/src/FactSystem/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+add_subdirectory(FactControls)
+
 set(EXTRA_SRC)
 if(BUILD_TESTING)
 	list(APPEND EXTRA_SRC
@@ -11,7 +13,6 @@ endif()
 
 add_library(FactSystem
 	Fact.cc
-	FactControls/FactPanelController.cc
 	FactGroup.cc
 	FactMetaData.cc
 	FactSystem.cc
@@ -25,6 +26,7 @@ add_library(FactSystem
 target_link_libraries(FactSystem
 	PRIVATE
 		qgc
+		FactControls
 )
 
 target_include_directories(FactSystem
diff --git a/src/FactSystem/FactControls/CMakeLists.txt b/src/FactSystem/FactControls/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c6d3c7f9055ef274f487e8957c60f0389df2cee6
--- /dev/null
+++ b/src/FactSystem/FactControls/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_library(FactControls
+    FactPanelController.cc
+)
+
+add_custom_target(FactControlsQml
+    SOURCES
+    AltitudeFactTextField.qml  
+    FactCheckBox.qml  
+    FactLabel.qml          
+    FactTextField.qml     
+    FactTextFieldSlider.qml
+    FactBitmask.qml            
+    FactComboBox.qml  
+    FactTextFieldGrid.qml  
+    FactTextFieldRow.qml  
+    FactValueSlider.qml
+)
+
+target_link_libraries(FactControls qgc)
\ No newline at end of file