diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index 9fcc463..b92e0d1 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -1,5 +1,3 @@
-import Build_gradle.BaseManager.artifactVersion
-import Build_gradle.BaseManager.displayBaseProperties
 import java.util.*
 
 plugins {
@@ -10,29 +8,6 @@ plugins {
     `java-library`
 }
 
-object BaseManager {
-    val Project.artifactVersion: String
-        get() = "artifact.version".run(
-            Properties().apply {
-                "artifact.version.key"
-                    .run(properties::get)
-                    .let {
-                        "user.home"
-                            .run(System::getProperty)
-                            .run { "$this$it" }
-                    }.run(::File)
-                    .inputStream()
-                    .use(::load)
-            }::get
-        ).toString()
-
-    fun Project.displayBaseProperties(): Unit = artifactVersion
-        .run { "BASE VERSION : $this" }
-        .run(::println)
-}
-
-version = project.artifactVersion
-
 repositories { mavenCentral() }
 
 dependencies {
@@ -45,15 +20,18 @@ dependencies {
     implementation(libs.guava)
 }
 
-//java {
-//    toolchain {
-//        languageVersion = JavaLanguageVersion.of(21)
-//    }
-//}
-
-tasks.named<Test>("test") { useJUnitPlatform() }
-
-
-tasks.register<DefaultTask>("displayBaseProperties") {
-    doFirst { project.displayBaseProperties() }
-}
\ No newline at end of file
+version = "artifact.version".run(
+    Properties().apply {
+        "artifact.version.key"
+            .run(properties::get)
+            .let {
+                "user.home"
+                    .run(System::getProperty)
+                    .run { "$this$it" }
+            }.run(::File)
+            .inputStream()
+            .use(::load)
+    }::get
+).toString()
+
+tasks.named<Test>("test") { useJUnitPlatform() }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/school/ai/AssistantPlugin.kt b/buildSrc/src/main/kotlin/school/ai/AssistantPlugin.kt
index aedb8af..50d6f90 100755
--- a/buildSrc/src/main/kotlin/school/ai/AssistantPlugin.kt
+++ b/buildSrc/src/main/kotlin/school/ai/AssistantPlugin.kt
@@ -2,35 +2,21 @@ package school.ai
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import school.ai.AssistantManager.openAIapiKey
 import school.ai.AssistantManager.createChatTasks
-import school.ai.AssistantManager.createStreamingChatTask
-import school.ai.AssistantManager.localModels
-import school.workspace.WorkspaceManager.privateProps
+import school.ai.AssistantManager.openAIapiKey
 import school.ai.AssistantManager.userMessage
+import school.workspace.WorkspaceManager.privateProps
 
 class AssistantPlugin : Plugin<Project> {
 
     override fun apply(project: Project) {
 
-        project.task("displayAIPrompt") {
+        project.task("displayE3POPrompt") {
             group = "school-ai"
             description = "Dislpay on console AI prompt assistant"
             doFirst { userMessage.let(::println) }
         }
 
-        project.task("displayOpenAIKey") {
-            group = "school-ai"
-            description = "Display the open ai api keys stored in private.properties"
-            doFirst { "apiKey : ${project.openAIapiKey}".let(::println) }
-        }
-
-        project.task("displayPrivateProperties") {
-            group = "school-ai"
-            description = "Display the open ai api keys stored in private.properties"
-            doFirst { println("PrivateProperties : ${project.privateProps}") }
-        }
-
         // Creating tasks for each model
         project.createChatTasks()
     }
diff --git a/buildSrc/src/main/kotlin/school/workspace/WorkspaceManager.kt b/buildSrc/src/main/kotlin/school/workspace/WorkspaceManager.kt
index a401539..ef939bf 100755
--- a/buildSrc/src/main/kotlin/school/workspace/WorkspaceManager.kt
+++ b/buildSrc/src/main/kotlin/school/workspace/WorkspaceManager.kt
@@ -26,6 +26,7 @@ import java.io.IOException
 import java.nio.charset.StandardCharsets.UTF_8
 import java.util.*
 
+
 @Suppress("MemberVisibilityCanBePrivate")
 object WorkspaceManager {
     const val CVS_ORIGIN: String = "origin"
diff --git a/buildSrc/src/main/kotlin/school/workspace/WorkspacePlugin.kt b/buildSrc/src/main/kotlin/school/workspace/WorkspacePlugin.kt
new file mode 100644
index 0000000..063cfd0
--- /dev/null
+++ b/buildSrc/src/main/kotlin/school/workspace/WorkspacePlugin.kt
@@ -0,0 +1,17 @@
+@file:Suppress("unused")
+
+package school.workspace
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import school.workspace.WorkspaceManager.privateProps
+
+class WorkspacePlugin : Plugin<Project> {
+    override fun apply(project: Project) {
+        project.task("displayPrivateProperties") {
+            group = "school"
+            description = "Display the key/value pairs stored in private.properties"
+            doFirst { println("PrivateProperties : ${project.privateProps}") }
+        }
+    }
+}
\ No newline at end of file