diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1aa8ff9..d145f2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,9 @@ PROJECT(${PROJECT} C CXX)
 # -----------------------------------------------------------------------------
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
@@ -81,10 +83,6 @@ set(PLUGIN_SOURCES
     src/OmeHelper.h
 )
 
-set(PLUGIN_MOC_HEADERS
-    src/ImageLoaderPlugin.h
-)
-
 set(WIDGET_SOURCES
     src/ImageLoaderDialog.h
     src/ImageLoaderDialog.cpp
@@ -125,39 +123,30 @@ set(ACTION_SOURCES
     src/MirrorAction.cpp
 )
 
-set(AUX src/ImageLoaderPlugin.json)
-
-file(GLOB UIS src/*.ui)
-
-set(AUX src/ImageLoaderPlugin.json)
+set(AUX 
+    PluginInfo.json
+)
 
 set(SOURCES 
     ${PLUGIN_SOURCES}
-    ${LOADER_SOURCES}
-    ${SCANNER_SOURCES}
     ${WIDGET_SOURCES}
-    ${MODEL_SOURCES}
     ${ACTION_SOURCES}
 )
 
-source_group(Plugin FILES ${PLUGIN_SOURCES} ${AUX})
+source_group(Plugin FILES ${PLUGIN_SOURCES})
 source_group(Widgets FILES ${WIDGET_SOURCES})
 source_group(Actions FILES ${ACTION_SOURCES})
-source_group(UI FILES ${UIS})
 source_group(Aux FILES ${AUX})
 
-QT6_WRAP_UI(UI_HEADERS ${UIS})
-
 # -----------------------------------------------------------------------------
 # CMake Target
 # -----------------------------------------------------------------------------
-add_library(${PROJECT} SHARED ${SOURCES} ${UIS} ${AUX})
+add_library(${PROJECT} SHARED ${SOURCES} ${AUX})
 
 # -----------------------------------------------------------------------------
 # Target include directories
 # -----------------------------------------------------------------------------
 target_include_directories(${PROJECT} PRIVATE "${ManiVault_INCLUDE_DIR}")
-target_include_directories(${PROJECT} PRIVATE src)
 
 # -----------------------------------------------------------------------------
 # Target properties
@@ -200,10 +189,7 @@ add_custom_command(TARGET ${PROJECT} POST_BUILD
     --prefix ${ManiVault_INSTALL_DIR}/$<CONFIGURATION>
 )
 
-set_target_properties(${PROJECT}
-    PROPERTIES
-    FOLDER LoaderPlugins
-)
+mv_handle_plugin_config(${PROJECT})
 
 # -----------------------------------------------------------------------------
 # Miscellaneous
diff --git a/PluginInfo.json b/PluginInfo.json
new file mode 100644
index 0000000..fbd86d9
--- /dev/null
+++ b/PluginInfo.json
@@ -0,0 +1,10 @@
+{
+    "name" : "Image Loader",
+    "menuName" : "Images",
+    "version" :  {
+        "plugin" : "0.1.0",
+        "core" : ["1.3"]
+    },
+    "type" : "Loader",
+    "dependencies" : ["Images"]
+}
diff --git a/src/ImageLoaderPlugin.cpp b/src/ImageLoaderPlugin.cpp
index 39b0d07..8f222ff 100644
--- a/src/ImageLoaderPlugin.cpp
+++ b/src/ImageLoaderPlugin.cpp
@@ -8,7 +8,7 @@
 using namespace mv;
 using namespace mv::plugin;
 
-Q_PLUGIN_METADATA(IID "nl.BioVault.ImageLoaderPlugin")
+Q_PLUGIN_METADATA(IID "studio.manivault.ImageLoaderPlugin")
 
 ImageLoaderPlugin::ImageLoaderPlugin(const PluginFactory* factory) :
     LoaderPlugin(factory),
diff --git a/src/ImageLoaderPlugin.h b/src/ImageLoaderPlugin.h
index a6868a8..cfba800 100644
--- a/src/ImageLoaderPlugin.h
+++ b/src/ImageLoaderPlugin.h
@@ -55,7 +55,8 @@ class ImageLoaderPluginFactory : public LoaderPluginFactory
 {
     Q_INTERFACES(mv::plugin::LoaderPluginFactory mv::plugin::PluginFactory)
         Q_OBJECT
-        Q_PLUGIN_METADATA(IID   "nl.BioVault.ImageLoaderPlugin" FILE  "ImageLoaderPlugin.json")
+        Q_PLUGIN_METADATA(IID   "studio.manivault.ImageLoaderPlugin" 
+                          FILE  "PluginInfo.json")
 
 public:
     /** Default constructor */
diff --git a/src/ImageLoaderPlugin.json b/src/ImageLoaderPlugin.json
deleted file mode 100644
index 455459a..0000000
--- a/src/ImageLoaderPlugin.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "name" : "Image Loader",
-    "menuName" : "Images",
-    "version" : "0.1.0",
-    "dependencies" : ["Images"]
-}