diff --git a/app/server/src/main/java/com/mobtools/server/services/PostgresDBPluginExecutor.java b/app/server/src/main/java/com/mobtools/server/plugins/PostgresDBPluginExecutor.java
similarity index 96%
rename from app/server/src/main/java/com/mobtools/server/services/PostgresDBPluginExecutor.java
rename to app/server/src/main/java/com/mobtools/server/plugins/PostgresDBPluginExecutor.java
index acfc9de31b..c37eed775e 100644
--- a/app/server/src/main/java/com/mobtools/server/services/PostgresDBPluginExecutor.java
+++ b/app/server/src/main/java/com/mobtools/server/plugins/PostgresDBPluginExecutor.java
@@ -1,7 +1,8 @@
-package com.mobtools.server.services;
+package com.mobtools.server.plugins;
 
 import com.mobtools.server.domains.Query;
 import com.mobtools.server.dtos.CommandQueryParams;
+import com.mobtools.server.services.PluginExecutor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
diff --git a/app/server/src/main/java/com/mobtools/server/services/PluginExecutor.java b/app/server/src/main/java/com/mobtools/server/services/PluginExecutor.java
index 9ded2cc31e..45e09fd913 100644
--- a/app/server/src/main/java/com/mobtools/server/services/PluginExecutor.java
+++ b/app/server/src/main/java/com/mobtools/server/services/PluginExecutor.java
@@ -26,17 +26,17 @@ public abstract class PluginExecutor {
      * @param params
      * @return Flux<Object>
      */
-    abstract Flux<Object> execute(Query query, CommandQueryParams params);
+    protected abstract Flux<Object> execute(Query query, CommandQueryParams params);
 
     /**
      * This function should be run when the plugin is initialized
      */
-    abstract void init();
+    protected abstract void init();
 
     /**
      * This function should be run when the plugin is destroyed
      */
-    abstract void destroy();
+    protected abstract void destroy();
 
     /**
      * This function replaces the variables in the query commandTemplate with the actual params
@@ -45,7 +45,7 @@ public abstract class PluginExecutor {
      * @param query Query
      * @param params CommandQueryParams
      */
-    Query replaceTemplate(Query query, CommandQueryParams params) {
+    protected Query replaceTemplate(Query query, CommandQueryParams params) {
         MustacheFactory mf = new DefaultMustacheFactory();
         Mustache mustache = mf.compile(new StringReader(query.getCommandTemplate()), "commandTemplate");
         Writer writer = new StringWriter();