diff --git a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/build.gradle b/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/build.gradle
new file mode 100644
index 0000000..066cf27
--- /dev/null
+++ b/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/build.gradle
@@ -0,0 +1,47 @@
+ext.pluginApiVersion = '8.7.0'
+ext.luceneVersion = '9.5.0'
+
+buildscript {
+    ext.pluginApiVersion = '8.7.0'
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.elasticsearch.gradle:build-tools:${pluginApiVersion}"
+    }
+}
+
+apply plugin: 'elasticsearch.stable-esplugin'
+apply plugin: 'elasticsearch.yaml-rest-test'
+
+esplugin {
+    name 'analysis-sefaria-naive-lemmatizer-less-prefixes'
+    description 'Sefaria analyzer'
+}
+
+group 'org.sefaria.sefariaplugin'
+version '1.0-SNAPSHOT'
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+dependencies {
+
+    compileOnly "org.elasticsearch.plugin:elasticsearch-plugin-api:${pluginApiVersion}"
+    compileOnly "org.elasticsearch.plugin:elasticsearch-plugin-analysis-api:${pluginApiVersion}"
+    compileOnly "org.apache.lucene:lucene-analysis-common:${luceneVersion}"
+
+    testImplementation "org.elasticsearch.plugin:elasticsearch-plugin-api:${pluginApiVersion}"
+    testImplementation "org.elasticsearch.plugin:elasticsearch-plugin-analysis-api:${pluginApiVersion}"
+    testImplementation "org.apache.lucene:lucene-analysis-common:${luceneVersion}"
+
+    testImplementation ('junit:junit:4.13.2'){
+        exclude group: 'org.hamcrest'
+    }
+    testImplementation 'org.mockito:mockito-core:4.4.0'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
+
+}
+
diff --git a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/es-plugin.properties b/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/es-plugin.properties
deleted file mode 100644
index ddd893a..0000000
--- a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/es-plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-plugin=org.sefaria.sefariaplugin.plugin.SefariaPlugin
\ No newline at end of file
diff --git a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/out/artifacts/elasticsearch.zip b/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/out/artifacts/elasticsearch.zip
deleted file mode 100644
index b88c4d1..0000000
Binary files a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/out/artifacts/elasticsearch.zip and /dev/null differ
diff --git a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/out/artifacts/elasticsearch/elasticsearch-analysis-sefaria.jar b/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/out/artifacts/elasticsearch/elasticsearch-analysis-sefaria.jar
deleted file mode 100644
index 22f2995..0000000
Binary files a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/out/artifacts/elasticsearch/elasticsearch-analysis-sefaria.jar and /dev/null differ
diff --git a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/out/artifacts/elasticsearch/plugin-descriptor.properties b/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/out/artifacts/elasticsearch/plugin-descriptor.properties
deleted file mode 100644
index b8b729c..0000000
--- a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/out/artifacts/elasticsearch/plugin-descriptor.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-name=analysis-sefaria-naive-lemmatizer-less-prefixes
-description=Sefaria analyzer powered by Noah
-classname=org.sefaria.sefariaplugin.plugin.SefariaPlugin
-elasticsearch.version=7.17.5
-java.version=1.8
-version=7.17.5
diff --git a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/plugin-descriptor.properties b/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/plugin-descriptor.properties
deleted file mode 100644
index 9b4f3d7..0000000
--- a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/plugin-descriptor.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-name=analysis-sefaria-naive-lemmatizer-less-prefixes
-description=Sefaria analyzer powered by Noah
-classname=org.sefaria.sefariaplugin.plugin.SefariaPlugin
-elasticsearch.version=6.2.3
-java.version=1.8
-version=6.2.3
diff --git a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/pom.xml b/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/pom.xml
deleted file mode 100644
index 25e0e28..0000000
--- a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.sefaria.sefaria-analysis</groupId>
-    <artifactId>elasticsearch-analysis-sefaria</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>elasticsearch-analysis-sefaria</name>
-    <url>http://sefaria.org</url>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <outputDirectory>out/artifacts/elasticsearch</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <lucene.version>7.2.1</lucene.version>
-        <elasticsearch.version>6.2.3</elasticsearch.version>
-        <sefaria.version>1.0.0</sefaria.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-test-framework</artifactId>
-            <version>${lucene.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-core</artifactId>
-            <version>${lucene.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-common</artifactId>
-            <version>${lucene.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <version>${elasticsearch.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>17.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/src/main/java/org/sefaria/sefariaplugin/plugin/SefariaAnalyzerProvider.java b/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/src/main/java/org/sefaria/sefariaplugin/plugin/SefariaAnalyzerProvider.java
deleted file mode 100644
index 65f2ef7..0000000
--- a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/src/main/java/org/sefaria/sefariaplugin/plugin/SefariaAnalyzerProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.sefaria.sefariaplugin.plugin;
-
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.env.Environment;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
-import org.sefaria.sefariaplugin.analysis.SefariaAnalyzer;
-
-public class SefariaAnalyzerProvider extends AbstractIndexAnalyzerProvider<SefariaAnalyzer> {
-    private final SefariaAnalyzer analyzer;
-
-    public SefariaAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
-        super(indexSettings, name, settings);
-
-        analyzer = new SefariaAnalyzer();
-    }
-
-    @Override public SefariaAnalyzer get() {
-        return this.analyzer;
-    }
-}
diff --git a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/src/main/java/org/sefaria/sefariaplugin/plugin/SefariaPlugin.java b/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/src/main/java/org/sefaria/sefariaplugin/plugin/SefariaPlugin.java
deleted file mode 100644
index 3395710..0000000
--- a/Sefaria-ElasticSearch-naive-lemmatizer-less-prefixes/src/main/java/org/sefaria/sefariaplugin/plugin/SefariaPlugin.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.sefaria.sefariaplugin.plugin;
-import org.apache.lucene.analysis.Analyzer;
-import org.elasticsearch.index.analysis.AnalyzerProvider;
-import org.elasticsearch.indices.analysis.AnalysisModule;
-import org.elasticsearch.plugins.AnalysisPlugin;
-import  org.elasticsearch.plugins.Plugin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class SefariaPlugin extends Plugin implements AnalysisPlugin {
-
-    @Override
-    public Map<String, AnalysisModule.AnalysisProvider<AnalyzerProvider<? extends Analyzer>>> getAnalyzers() {
-        Map<String, AnalysisModule.AnalysisProvider<AnalyzerProvider<? extends Analyzer>>> extra = new HashMap<>();
-
-        extra.put("sefaria-naive-lemmatizer-less-prefixes", SefariaAnalyzerProvider::new);
-
-        return extra;
-    }
-
-}
diff --git a/Sefaria-ElasticSearch-naive-lemmatizer/build.gradle b/Sefaria-ElasticSearch-naive-lemmatizer/build.gradle
index 6f037d1..33c4e5b 100644
--- a/Sefaria-ElasticSearch-naive-lemmatizer/build.gradle
+++ b/Sefaria-ElasticSearch-naive-lemmatizer/build.gradle
@@ -16,7 +16,7 @@ apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
     name 'analysis-sefaria-naive-lemmatizer'
-    description 'My analysis plugin'
+    description 'Sefaria analyzer'
 }
 
 group 'org.sefaria.sefariaplugin'