diff --git a/plugin/.classpath b/plugin/.classpath
index d541b7d8..1e9ec8ec 100644
--- a/plugin/.classpath
+++ b/plugin/.classpath
@@ -1,35 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
-			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="src" output="target/classes" path="src">
 		<attributes>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+	<classpathentry kind="src" output="target/classes" path="target/generated-sources">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="tst">
 		<attributes>
 			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+	<classpathentry exported="true" kind="lib" path="target/dependency/annotations.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/apache-client.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/auth.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/aws-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/aws-json-protocol.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/checksums-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/checksums.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/cognitoidentity.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/commons-codec.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/delight-rhino-sandbox.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/endpoints-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/http-auth-aws-eventstream.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/http-auth-aws.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/http-auth-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/http-auth.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/http-client-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/httpclient.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/httpcore.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/identity-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/jackson-annotations.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/jackson-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/jackson-databind.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/jakarta.inject-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/jna-platform.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/jna.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/json-utils.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/maven-artifact.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/metrics-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/netty-nio-client.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/nimbus-jose-jwt.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/profiles.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/protocol-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/proxy-vole.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/reactive-streams.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/regions.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/retries-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/retries.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/rxjava.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/sdk-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/slf4j-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/third-party-jackson-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/utils.jar"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
-			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="main/resources/|test/resources/" kind="src" path="src"/>
-	<classpathentry kind="src" path="target/generated-sources"/>
 	<classpathentry kind="output" path="target/classes"/>
-</classpath>
\ No newline at end of file
+</classpath>
diff --git a/plugin/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF
index 9ff16a34..d17c452f 100644
--- a/plugin/META-INF/MANIFEST.MF
+++ b/plugin/META-INF/MANIFEST.MF
@@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0",
  org.apache.commons.logging;bundle-version="1.2.0",
  slf4j.api;bundle-version="2.0.13",
  org.apache.commons.lang3;bundle-version="3.14.0"
-Bundle-Classpath: target/classes/,
+Bundle-Classpath: .,
  target/dependency/annotations.jar,
  target/dependency/apache-client.jar,
  target/dependency/auth.jar,
diff --git a/plugin/build.properties b/plugin/build.properties
index cb3ad8c7..bc1bd6c9 100644
--- a/plugin/build.properties
+++ b/plugin/build.properties
@@ -1,4 +1,4 @@
-source.. = src/, target/generated-sources
+source.. = src/, target/generated-sources, tst/
 output.. = target/classes
 bin.includes = plugin.xml,\
                META-INF/,\
diff --git a/pom.xml b/pom.xml
index 8b1a1dc0..c1ac2fe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,6 @@
             <layout>p2</layout>
             <url>https://download.eclipse.org/releases/2024-06</url>
         </repository>
-
     </repositories>
 
     <build>