diff --git a/OpenFlipper/cmake/type.cmake b/OpenFlipper/cmake/type.cmake
index e0d963032901f32c789e7fc8d77c3cdc025e1c78..fe5416acf3acbb38cb92cd6de576e906e577c38d 100644
--- a/OpenFlipper/cmake/type.cmake
+++ b/OpenFlipper/cmake/type.cmake
@@ -38,7 +38,9 @@ endif ()
 # collect all header,source files
 acg_append_files_recursive (headers "*.hh" . )
 acg_append_files_recursive (sources "*.cc" . )
+acg_append_files_recursive (ui "*.ui" . )
 acg_qt5_automoc (moc_targets ${headers})
+acg_qt5_autouic (uic_targets ${ui})
 
 
 # Match our current directory name
@@ -59,7 +61,7 @@ include_directories (
 
 # remove template cc files from source file list
 acg_drop_templates (sources)
-acg_add_library ( ${TYPENAME} SHARED ${sources} ${headers} ${moc_targets})
+acg_add_library ( ${TYPENAME} SHARED ${uic_targets} ${sources} ${headers} ${moc_targets})
 set_target_properties ( ${TYPENAME} PROPERTIES MACOSX_RPATH 0 )
 
 add_dependencies( ${TYPENAME} OpenMeshCore OpenMeshTools ACG OpenFlipperPluginLib)
diff --git a/ObjectTypes/Light/Light.hh b/Type-Light/ObjectTypes/Light/Light.hh
similarity index 100%
rename from ObjectTypes/Light/Light.hh
rename to Type-Light/ObjectTypes/Light/Light.hh
diff --git a/ObjectTypes/Light/LightNode.cc b/Type-Light/ObjectTypes/Light/LightNode.cc
similarity index 100%
rename from ObjectTypes/Light/LightNode.cc
rename to Type-Light/ObjectTypes/Light/LightNode.cc
diff --git a/ObjectTypes/Light/LightNode.hh b/Type-Light/ObjectTypes/Light/LightNode.hh
similarity index 100%
rename from ObjectTypes/Light/LightNode.hh
rename to Type-Light/ObjectTypes/Light/LightNode.hh
diff --git a/ObjectTypes/Light/LightObject.cc b/Type-Light/ObjectTypes/Light/LightObject.cc
similarity index 100%
rename from ObjectTypes/Light/LightObject.cc
rename to Type-Light/ObjectTypes/Light/LightObject.cc
diff --git a/ObjectTypes/Light/LightObject.hh b/Type-Light/ObjectTypes/Light/LightObject.hh
similarity index 100%
rename from ObjectTypes/Light/LightObject.hh
rename to Type-Light/ObjectTypes/Light/LightObject.hh
diff --git a/ObjectTypes/Light/LightTypes.hh b/Type-Light/ObjectTypes/Light/LightTypes.hh
similarity index 100%
rename from ObjectTypes/Light/LightTypes.hh
rename to Type-Light/ObjectTypes/Light/LightTypes.hh
diff --git a/ObjectTypes/Light/LightWidget.cc b/Type-Light/ObjectTypes/Light/LightWidget.cc
similarity index 100%
rename from ObjectTypes/Light/LightWidget.cc
rename to Type-Light/ObjectTypes/Light/LightWidget.cc
diff --git a/ObjectTypes/Light/LightWidget.hh b/Type-Light/ObjectTypes/Light/LightWidget.hh
similarity index 100%
rename from ObjectTypes/Light/LightWidget.hh
rename to Type-Light/ObjectTypes/Light/LightWidget.hh
diff --git a/ObjectTypes/Light/PluginFunctionsLight.cc b/Type-Light/ObjectTypes/Light/PluginFunctionsLight.cc
similarity index 100%
rename from ObjectTypes/Light/PluginFunctionsLight.cc
rename to Type-Light/ObjectTypes/Light/PluginFunctionsLight.cc
diff --git a/ObjectTypes/Light/PluginFunctionsLight.hh b/Type-Light/ObjectTypes/Light/PluginFunctionsLight.hh
similarity index 100%
rename from ObjectTypes/Light/PluginFunctionsLight.hh
rename to Type-Light/ObjectTypes/Light/PluginFunctionsLight.hh
diff --git a/ObjectTypes/Light/lightWidget.ui b/Type-Light/ObjectTypes/Light/lightWidget.ui
similarity index 100%
rename from ObjectTypes/Light/lightWidget.ui
rename to Type-Light/ObjectTypes/Light/lightWidget.ui
diff --git a/PluginCollection-TypePlugins/Plugin-TypeLight/CMakeLists.txt b/Type-Light/Plugin-TypeLight/CMakeLists.txt
similarity index 100%
rename from PluginCollection-TypePlugins/Plugin-TypeLight/CMakeLists.txt
rename to Type-Light/Plugin-TypeLight/CMakeLists.txt
diff --git a/PluginCollection-TypePlugins/Plugin-TypeLight/Icons/LightOff.png b/Type-Light/Plugin-TypeLight/Icons/LightOff.png
similarity index 100%
rename from PluginCollection-TypePlugins/Plugin-TypeLight/Icons/LightOff.png
rename to Type-Light/Plugin-TypeLight/Icons/LightOff.png
diff --git a/PluginCollection-TypePlugins/Plugin-TypeLight/Icons/LightType.png b/Type-Light/Plugin-TypeLight/Icons/LightType.png
similarity index 100%
rename from PluginCollection-TypePlugins/Plugin-TypeLight/Icons/LightType.png
rename to Type-Light/Plugin-TypeLight/Icons/LightType.png
diff --git a/PluginCollection-TypePlugins/Plugin-TypeLight/TypeLight.cc b/Type-Light/Plugin-TypeLight/TypeLight.cc
similarity index 100%
rename from PluginCollection-TypePlugins/Plugin-TypeLight/TypeLight.cc
rename to Type-Light/Plugin-TypeLight/TypeLight.cc
diff --git a/PluginCollection-TypePlugins/Plugin-TypeLight/TypeLight.hh b/Type-Light/Plugin-TypeLight/TypeLight.hh
similarity index 100%
rename from PluginCollection-TypePlugins/Plugin-TypeLight/TypeLight.hh
rename to Type-Light/Plugin-TypeLight/TypeLight.hh