diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
index ee08a26..6455c36 100644
--- a/META-INF/plugin.xml
+++ b/META-INF/plugin.xml
@@ -23,7 +23,7 @@
   -->
 
   <extensions defaultExtensionNs="com.intellij">
-    <codeInsight.lineMarkerProvider language="PHP" implementationClass="pl.projectspace.idea.plugins.php.atoum.actions.ClassLineMarkerProvider" />
+    <codeInsight.lineMarkerProvider language="PHP" implementationClass="org.atoum.intellij.plugin.atoum.linemarker.ClassLineMarkerProvider" />
     <iconProvider implementation="org.atoum.intellij.plugin.atoum.AtoumIconProvider" />
     <!-- Add your extensions here -->
   </extensions>
@@ -38,8 +38,8 @@
 
   <actions>
     <!-- Add your actions here -->
-    <action id="AtoumSwitchContext" class="pl.projectspace.idea.plugins.php.atoum.actions.AtoumSwitchContext"
-            icon="/pl/projectspace/idea/plugins/php/atoum/icons/atoum_16_16.png"
+    <action id="AtoumSwitchContext" class="org.atoum.intellij.plugin.atoum.actions.SwitchContext"
+            icon="/org/atoum/intellij/plugin/atoum/icons/atoum_16_16.png"
             text="Swicth to test class / tested class">
       <add-to-group group-id="GoToCodeGroup" anchor="last"/>
       <add-to-group group-id="EditorPopupMenu.GoTo" anchor="last"/>
@@ -47,7 +47,7 @@
     </action>
 
     <action id="AtoumRunTests" class="org.atoum.intellij.plugin.atoum.actions.Run"
-            icon="/pl/projectspace/idea/plugins/php/atoum/icons/atoum_16_16.png"
+            icon="/org/atoum/intellij/plugin/atoum/icons/atoum_16_16.png"
             text="run tests">
       <add-to-group group-id="RunMenu" anchor="last"/>
       <add-to-group group-id="EditorPopupMenu.Run" anchor="last"/>
diff --git a/resources/pl/projectspace/idea/plugins/php/atoum/icons/atoum_16_16.png b/resources/pl/projectspace/idea/plugins/php/atoum/icons/atoum_16_16.png
deleted file mode 100644
index fe00797..0000000
Binary files a/resources/pl/projectspace/idea/plugins/php/atoum/icons/atoum_16_16.png and /dev/null differ
diff --git a/resources/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon.png b/resources/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon.png
deleted file mode 100644
index b842276..0000000
Binary files a/resources/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon.png and /dev/null differ
diff --git a/resources/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon@2x.png b/resources/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon@2x.png
deleted file mode 100644
index 60367c5..0000000
Binary files a/resources/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon@2x.png and /dev/null differ
diff --git a/src/org/atoum/intellij/plugin/atoum/AtoumIconProvider.java b/src/org/atoum/intellij/plugin/atoum/AtoumIconProvider.java
index d580b57..3c15fca 100644
--- a/src/org/atoum/intellij/plugin/atoum/AtoumIconProvider.java
+++ b/src/org/atoum/intellij/plugin/atoum/AtoumIconProvider.java
@@ -7,8 +7,6 @@
 import com.jetbrains.php.lang.psi.PhpFile;
 import javax.swing.Icon;
 import org.jetbrains.annotations.NotNull;
-import pl.projectspace.idea.plugins.php.atoum.actions.Icons;
-import pl.projectspace.idea.plugins.php.atoum.actions.Utils;
 
 public class AtoumIconProvider extends IconProvider {
 
diff --git a/src/org/atoum/intellij/plugin/atoum/Icons.java b/src/org/atoum/intellij/plugin/atoum/Icons.java
new file mode 100644
index 0000000..577a5ee
--- /dev/null
+++ b/src/org/atoum/intellij/plugin/atoum/Icons.java
@@ -0,0 +1,11 @@
+package org.atoum.intellij.plugin.atoum;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+public class Icons {
+
+    public static final Icon ATOUM = IconLoader.getIcon("/org/atoum/intellij/plugin/atoum/icons/atoum_16_16.png");
+    public static final Icon ATOUM_FILE = IconLoader.getIcon("/org/atoum/intellij/plugin/atoum/icons/phpfile-atoum-icon.png");
+}
diff --git a/src/pl/projectspace/idea/plugins/php/atoum/actions/Utils.java b/src/org/atoum/intellij/plugin/atoum/Utils.java
similarity index 98%
rename from src/pl/projectspace/idea/plugins/php/atoum/actions/Utils.java
rename to src/org/atoum/intellij/plugin/atoum/Utils.java
index 20e2be8..758d3cc 100644
--- a/src/pl/projectspace/idea/plugins/php/atoum/actions/Utils.java
+++ b/src/org/atoum/intellij/plugin/atoum/Utils.java
@@ -1,4 +1,4 @@
-package pl.projectspace.idea.plugins.php.atoum.actions;
+package org.atoum.intellij.plugin.atoum;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.project.Project;
diff --git a/src/org/atoum/intellij/plugin/atoum/actions/Run.java b/src/org/atoum/intellij/plugin/atoum/actions/Run.java
index e3aa89a..84439eb 100644
--- a/src/org/atoum/intellij/plugin/atoum/actions/Run.java
+++ b/src/org/atoum/intellij/plugin/atoum/actions/Run.java
@@ -11,7 +11,7 @@
 import org.atoum.intellij.plugin.atoum.model.RunnerConfiguration;
 import org.atoum.intellij.plugin.atoum.run.Runner;
 import org.jetbrains.annotations.Nullable;
-import pl.projectspace.idea.plugins.php.atoum.actions.Utils;
+import org.atoum.intellij.plugin.atoum.Utils;
 
 public class Run extends AnAction {
 
diff --git a/src/pl/projectspace/idea/plugins/php/atoum/actions/AtoumSwitchContext.java b/src/org/atoum/intellij/plugin/atoum/actions/SwitchContext.java
similarity index 93%
rename from src/pl/projectspace/idea/plugins/php/atoum/actions/AtoumSwitchContext.java
rename to src/org/atoum/intellij/plugin/atoum/actions/SwitchContext.java
index 2d83391..f0324fd 100644
--- a/src/pl/projectspace/idea/plugins/php/atoum/actions/AtoumSwitchContext.java
+++ b/src/org/atoum/intellij/plugin/atoum/actions/SwitchContext.java
@@ -1,4 +1,4 @@
-package pl.projectspace.idea.plugins.php.atoum.actions;
+package org.atoum.intellij.plugin.atoum.actions;
 
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.project.Project;
@@ -6,8 +6,9 @@
 import com.jetbrains.php.lang.psi.elements.PhpClass;
 import org.jetbrains.annotations.Nullable;
 import com.intellij.ide.actions.OpenFileAction;
+import org.atoum.intellij.plugin.atoum.Utils;
 
-public class AtoumSwitchContext extends AnAction {
+public class SwitchContext extends AnAction {
 
     @Override
     public void update(AnActionEvent e) {
diff --git a/src/pl/projectspace/idea/plugins/php/atoum/actions/ClassLineMarkerProvider.java b/src/org/atoum/intellij/plugin/atoum/linemarker/ClassLineMarkerProvider.java
similarity index 93%
rename from src/pl/projectspace/idea/plugins/php/atoum/actions/ClassLineMarkerProvider.java
rename to src/org/atoum/intellij/plugin/atoum/linemarker/ClassLineMarkerProvider.java
index bf07dd7..150360e 100644
--- a/src/pl/projectspace/idea/plugins/php/atoum/actions/ClassLineMarkerProvider.java
+++ b/src/org/atoum/intellij/plugin/atoum/linemarker/ClassLineMarkerProvider.java
@@ -1,7 +1,6 @@
-package pl.projectspace.idea.plugins.php.atoum.actions;
+package org.atoum.intellij.plugin.atoum.linemarker;
 
 import com.intellij.codeInsight.daemon.LineMarkerInfo;
-import com.intellij.codeInsight.daemon.LineMarkerProvider;
 import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo;
 import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder;
 import com.intellij.openapi.project.Project;
@@ -9,6 +8,8 @@
 import com.jetbrains.php.lang.psi.elements.PhpClass;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.atoum.intellij.plugin.atoum.Icons;
+import org.atoum.intellij.plugin.atoum.Utils;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/src/org/atoum/intellij/plugin/atoum/run/AtoumLocalRunConfigurationType.java b/src/org/atoum/intellij/plugin/atoum/run/AtoumLocalRunConfigurationType.java
index fad2cba..324156a 100644
--- a/src/org/atoum/intellij/plugin/atoum/run/AtoumLocalRunConfigurationType.java
+++ b/src/org/atoum/intellij/plugin/atoum/run/AtoumLocalRunConfigurationType.java
@@ -7,7 +7,7 @@
 import com.intellij.openapi.project.Project;
 import com.jetbrains.php.run.PhpRunConfigurationFactoryBase;
 import org.jetbrains.annotations.NotNull;
-import pl.projectspace.idea.plugins.php.atoum.actions.Icons;
+import org.atoum.intellij.plugin.atoum.Icons;
 
 import javax.swing.*;
 
diff --git a/src/org/atoum/intellij/plugin/atoum/run/Runner.java b/src/org/atoum/intellij/plugin/atoum/run/Runner.java
index de8f0ae..5247187 100644
--- a/src/org/atoum/intellij/plugin/atoum/run/Runner.java
+++ b/src/org/atoum/intellij/plugin/atoum/run/Runner.java
@@ -32,7 +32,7 @@
 import org.atoum.intellij.plugin.atoum.model.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import pl.projectspace.idea.plugins.php.atoum.actions.Icons;
+import org.atoum.intellij.plugin.atoum.Icons;
 
 import java.util.Arrays;
 
diff --git a/src/pl/projectspace/idea/plugins/php/atoum/actions/Icons.java b/src/pl/projectspace/idea/plugins/php/atoum/actions/Icons.java
deleted file mode 100644
index a07353f..0000000
--- a/src/pl/projectspace/idea/plugins/php/atoum/actions/Icons.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package pl.projectspace.idea.plugins.php.atoum.actions;
-
-import com.intellij.openapi.util.IconLoader;
-
-import javax.swing.*;
-
-public class Icons {
-
-    public static final Icon ATOUM = IconLoader.getIcon("/pl/projectspace/idea/plugins/php/atoum/icons/atoum_16_16.png");
-    public static final Icon ATOUM_FILE = IconLoader.getIcon("/pl/projectspace/idea/plugins/php/atoum/icons/phpfile-atoum-icon.png");
-}