diff --git a/java/src/processing/mode/java/languageServer/App.java b/java/src/processing/mode/java/lsp/App.java
similarity index 75%
rename from java/src/processing/mode/java/languageServer/App.java
rename to java/src/processing/mode/java/lsp/App.java
index bc884c405..7f12ad387 100644
--- a/java/src/processing/mode/java/languageServer/App.java
+++ b/java/src/processing/mode/java/lsp/App.java
@@ -1,10 +1,6 @@
-package processing.mode.java.languageServer;
+package processing.mode.java.lsp;
 
 import org.eclipse.lsp4j.launch.LSPLauncher;
-import java.io.File;
-import java.net.ServerSocket;
-import java.io.InputStream;
-import java.io.OutputStream;
 
 public class App {
   public static void main(String[] args) {
diff --git a/java/src/processing/mode/java/languageServer/ProcessingAdapter.java b/java/src/processing/mode/java/lsp/ProcessingAdapter.java
similarity index 92%
rename from java/src/processing/mode/java/languageServer/ProcessingAdapter.java
rename to java/src/processing/mode/java/lsp/ProcessingAdapter.java
index 44cd10a00..912e6ff46 100644
--- a/java/src/processing/mode/java/languageServer/ProcessingAdapter.java
+++ b/java/src/processing/mode/java/lsp/ProcessingAdapter.java
@@ -1,33 +1,19 @@
-package processing.mode.java.languageServer;
+package processing.mode.java.lsp;
 
-import org.eclipse.lsp4j.services.LanguageServer;
-import org.eclipse.lsp4j.services.TextDocumentService;
-import org.eclipse.lsp4j.services.WorkspaceService;
-import org.eclipse.lsp4j.InitializeResult;
-import org.eclipse.lsp4j.InitializeParams;
 import java.util.concurrent.CompletableFuture;
-import org.eclipse.lsp4j.ServerCapabilities;
-import org.eclipse.lsp4j.TextDocumentSyncKind;
-import org.eclipse.lsp4j.CompletionOptions;
-import org.eclipse.lsp4j.CompletionParams;
+
 import org.eclipse.lsp4j.CompletionItem;
-import org.eclipse.lsp4j.CompletionList;
 import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
 import java.util.List;
 import processing.app.Base;
 import processing.app.Platform;
-import processing.app.Console;
-import processing.app.Language;
 import processing.app.Preferences;
 import processing.app.contrib.ModeContribution;
 import processing.mode.java.JavaMode;
 import java.io.File;
 import processing.app.Sketch;
-import processing.mode.java.JavaBuild;
 import processing.mode.java.CompletionGenerator;
 import processing.mode.java.PreprocService;
-import org.eclipse.lsp4j.WorkspaceFoldersOptions;
-import org.eclipse.lsp4j.services.LanguageClientAware;
 import org.eclipse.lsp4j.services.LanguageClient;
 import processing.mode.java.ErrorChecker;
 import processing.app.Problem;
@@ -40,7 +26,6 @@ import processing.mode.java.PreprocSketch;
 import processing.mode.java.JavaTextArea;
 import java.util.Collections;
 import processing.mode.java.CompletionCandidate;
-import javax.swing.DefaultListModel;
 import org.eclipse.lsp4j.InsertTextFormat;
 import org.eclipse.lsp4j.CompletionItemKind;
 import org.jsoup.Jsoup;
@@ -55,7 +40,6 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.Map;
 import java.util.AbstractMap;
-import java.util.HashMap;
 import java.util.Set;
 
 class Offset {
diff --git a/java/src/processing/mode/java/languageServer/ProcessingLanguageServer.java b/java/src/processing/mode/java/lsp/ProcessingLanguageServer.java
similarity index 74%
rename from java/src/processing/mode/java/languageServer/ProcessingLanguageServer.java
rename to java/src/processing/mode/java/lsp/ProcessingLanguageServer.java
index e680ada48..2858cb34e 100644
--- a/java/src/processing/mode/java/languageServer/ProcessingLanguageServer.java
+++ b/java/src/processing/mode/java/lsp/ProcessingLanguageServer.java
@@ -1,4 +1,4 @@
-package processing.mode.java.languageServer;
+package processing.mode.java.lsp;
 
 
 import org.eclipse.lsp4j.services.LanguageServer;
@@ -10,32 +10,12 @@ import java.util.concurrent.CompletableFuture;
 import org.eclipse.lsp4j.ServerCapabilities;
 import org.eclipse.lsp4j.TextDocumentSyncKind;
 import org.eclipse.lsp4j.CompletionOptions;
-import org.eclipse.lsp4j.CompletionParams;
-import org.eclipse.lsp4j.CompletionItem;
-import org.eclipse.lsp4j.CompletionList;
-import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
-import processing.app.Base;
-import processing.app.Platform;
-import processing.app.Console;
-import processing.app.Language;
-import processing.app.Preferences;
-import processing.app.contrib.ModeContribution;
-import processing.mode.java.JavaMode;
+
 import java.io.File;
-import processing.app.Sketch;
-import processing.mode.java.JavaBuild;
-import processing.mode.java.CompletionGenerator;
-import processing.mode.java.PreprocService;
-import org.eclipse.lsp4j.WorkspaceFoldersOptions;
+
 import org.eclipse.lsp4j.services.LanguageClientAware;
 import org.eclipse.lsp4j.services.LanguageClient;
-import processing.mode.java.ErrorChecker;
-import processing.app.Problem;
-import org.eclipse.lsp4j.PublishDiagnosticsParams;
-import org.eclipse.lsp4j.Diagnostic;
-import org.eclipse.lsp4j.Range;
-import org.eclipse.lsp4j.Position;
-import org.eclipse.lsp4j.DiagnosticSeverity;
+
 import java.net.URI;
 import java.util.Optional;
 import java.util.HashMap;
diff --git a/java/src/processing/mode/java/languageServer/ProcessingTextDocumentService.java b/java/src/processing/mode/java/lsp/ProcessingTextDocumentService.java
similarity index 85%
rename from java/src/processing/mode/java/languageServer/ProcessingTextDocumentService.java
rename to java/src/processing/mode/java/lsp/ProcessingTextDocumentService.java
index 9709204da..af0f4df9c 100644
--- a/java/src/processing/mode/java/languageServer/ProcessingTextDocumentService.java
+++ b/java/src/processing/mode/java/lsp/ProcessingTextDocumentService.java
@@ -1,4 +1,4 @@
-package processing.mode.java.languageServer;
+package processing.mode.java.lsp;
 
 import org.eclipse.lsp4j.services.TextDocumentService;
 import org.eclipse.lsp4j.CompletionParams;
@@ -14,21 +14,8 @@ import org.eclipse.lsp4j.DidCloseTextDocumentParams;
 import org.eclipse.lsp4j.DidChangeTextDocumentParams;
 import org.eclipse.lsp4j.DocumentFormattingParams;
 import org.eclipse.lsp4j.TextEdit;
-import java.io.File;
-import processing.mode.java.AutoFormat;
-import org.eclipse.lsp4j.Position;
-import org.eclipse.lsp4j.Range;
+
 import java.util.Collections;
-import processing.mode.java.CompletionGenerator;
-import processing.mode.java.JavaTextArea;
-import java.util.Arrays;
-import processing.mode.java.CompletionCandidate;
-import javax.swing.DefaultListModel;
-import org.eclipse.lsp4j.CompletionItemKind;
-import org.eclipse.lsp4j.MarkupContent;
-import org.eclipse.lsp4j.MarkupKind;
-import org.jsoup.Jsoup;
-import org.eclipse.lsp4j.InsertTextFormat;
 import java.net.URI;
 
 class ProcessingTextDocumentService implements TextDocumentService {
diff --git a/java/src/processing/mode/java/languageServer/ProcessingWorkspaceService.java b/java/src/processing/mode/java/lsp/ProcessingWorkspaceService.java
similarity index 94%
rename from java/src/processing/mode/java/languageServer/ProcessingWorkspaceService.java
rename to java/src/processing/mode/java/lsp/ProcessingWorkspaceService.java
index e47b7ea9a..1a0e0ff4c 100644
--- a/java/src/processing/mode/java/languageServer/ProcessingWorkspaceService.java
+++ b/java/src/processing/mode/java/lsp/ProcessingWorkspaceService.java
@@ -1,9 +1,9 @@
-package processing.mode.java.languageServer;
+package processing.mode.java.lsp;
 
 import org.eclipse.lsp4j.services.WorkspaceService;
 import org.eclipse.lsp4j.DidChangeConfigurationParams;
 import org.eclipse.lsp4j.DidChangeWatchedFilesParams;
-import org.eclipse.lsp4j.FileChangeType;
+
 import java.net.URI;
 import java.io.IOException;