diff --git a/src/main/kotlin/com/github/nrayburntech/toolexperiments/listeners/MyApplicationActivationListener.kt b/src/main/kotlin/com/github/nrayburntech/toolexperiments/firsttool/listeners/MyApplicationActivationListener.kt
similarity index 87%
rename from src/main/kotlin/com/github/nrayburntech/toolexperiments/listeners/MyApplicationActivationListener.kt
rename to src/main/kotlin/com/github/nrayburntech/toolexperiments/firsttool/listeners/MyApplicationActivationListener.kt
index 47b9ee3..8530a5a 100644
--- a/src/main/kotlin/com/github/nrayburntech/toolexperiments/listeners/MyApplicationActivationListener.kt
+++ b/src/main/kotlin/com/github/nrayburntech/toolexperiments/firsttool/listeners/MyApplicationActivationListener.kt
@@ -1,4 +1,4 @@
-package com.github.nrayburntech.toolexperiments.listeners
+package com.github.nrayburntech.toolexperiments.firsttool.listeners
 
 import com.intellij.openapi.application.ApplicationActivationListener
 import com.intellij.openapi.diagnostic.thisLogger
diff --git a/src/main/kotlin/com/github/nrayburntech/toolexperiments/services/MyProjectService.kt b/src/main/kotlin/com/github/nrayburntech/toolexperiments/firsttool/services/MyProjectService.kt
similarity index 89%
rename from src/main/kotlin/com/github/nrayburntech/toolexperiments/services/MyProjectService.kt
rename to src/main/kotlin/com/github/nrayburntech/toolexperiments/firsttool/services/MyProjectService.kt
index 5f44614..59d816e 100644
--- a/src/main/kotlin/com/github/nrayburntech/toolexperiments/services/MyProjectService.kt
+++ b/src/main/kotlin/com/github/nrayburntech/toolexperiments/firsttool/services/MyProjectService.kt
@@ -1,4 +1,4 @@
-package com.github.nrayburntech.toolexperiments.services
+package com.github.nrayburntech.toolexperiments.firsttool.services
 
 import com.github.nrayburntech.toolexperiments.MyBundle
 import com.intellij.openapi.components.Service
diff --git a/src/main/kotlin/com/github/nrayburntech/toolexperiments/toolWindow/MyToolWindowFactory.kt b/src/main/kotlin/com/github/nrayburntech/toolexperiments/firsttool/toolWindow/MyToolWindowFactory.kt
similarity index 91%
rename from src/main/kotlin/com/github/nrayburntech/toolexperiments/toolWindow/MyToolWindowFactory.kt
rename to src/main/kotlin/com/github/nrayburntech/toolexperiments/firsttool/toolWindow/MyToolWindowFactory.kt
index bece4d1..cc97ad0 100644
--- a/src/main/kotlin/com/github/nrayburntech/toolexperiments/toolWindow/MyToolWindowFactory.kt
+++ b/src/main/kotlin/com/github/nrayburntech/toolexperiments/firsttool/toolWindow/MyToolWindowFactory.kt
@@ -1,7 +1,7 @@
-package com.github.nrayburntech.toolexperiments.toolWindow
+package com.github.nrayburntech.toolexperiments.firsttool.toolWindow
 
 import com.github.nrayburntech.toolexperiments.MyBundle
-import com.github.nrayburntech.toolexperiments.services.MyProjectService
+import com.github.nrayburntech.toolexperiments.firsttool.services.MyProjectService
 import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.project.Project
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index ab51749..dae2334 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -12,12 +12,12 @@
   <resource-bundle>messages.MyBundle</resource-bundle>
 
   <extensions defaultExtensionNs="com.intellij">
-    <toolWindow factoryClass="com.github.nrayburntech.toolexperiments.toolWindow.MyToolWindowFactory"
+    <toolWindow factoryClass="com.github.nrayburntech.toolexperiments.firsttool.toolWindow.MyToolWindowFactory"
       id="MyToolWindow"/>
   </extensions>
 
   <applicationListeners>
-    <listener class="com.github.nrayburntech.toolexperiments.listeners.MyApplicationActivationListener"
+    <listener class="com.github.nrayburntech.toolexperiments.firsttool.listeners.MyApplicationActivationListener"
       topic="com.intellij.openapi.application.ApplicationActivationListener"/>
   </applicationListeners>
 </idea-plugin>
diff --git a/src/test/kotlin/com/github/nrayburntech/toolexperiments/MyPluginTest.kt b/src/test/kotlin/com/github/nrayburntech/toolexperiments/MyPluginTest.kt
index f6bac34..83c99e0 100644
--- a/src/test/kotlin/com/github/nrayburntech/toolexperiments/MyPluginTest.kt
+++ b/src/test/kotlin/com/github/nrayburntech/toolexperiments/MyPluginTest.kt
@@ -1,6 +1,6 @@
 package com.github.nrayburntech.toolexperiments
 
-import com.github.nrayburntech.toolexperiments.services.MyProjectService
+import com.github.nrayburntech.toolexperiments.firsttool.services.MyProjectService
 import com.intellij.ide.highlighter.XmlFileType
 import com.intellij.openapi.components.service
 import com.intellij.psi.xml.XmlFile