Change root package from ro.fortsoft.pf4j to org.pf4j (#168)

87 files changed, 179 insertions, 180 deletions

diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/AbstractExtensionFinder.java b/pf4j/src/main/java/org/pf4j/AbstractExtensionFinder.java
index 8e4a506..49be73b 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/AbstractExtensionFinder.java
+++ b/pf4j/src/main/java/org/pf4j/AbstractExtensionFinder.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
+import org.pf4j.util.ClassUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ro.fortsoft.pf4j.util.ClassUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/AbstractPluginManager.java b/pf4j/src/main/java/org/pf4j/AbstractPluginManager.java
index 94fee2f..d2f2b42 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/AbstractPluginManager.java
+++ b/pf4j/src/main/java/org/pf4j/AbstractPluginManager.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ro.fortsoft.pf4j.util.StringUtils;
+import org.pf4j.util.StringUtils;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/BasePluginRepository.java b/pf4j/src/main/java/org/pf4j/BasePluginRepository.java
index e9ee47f..c5d5281 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/BasePluginRepository.java
+++ b/pf4j/src/main/java/org/pf4j/BasePluginRepository.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
-import ro.fortsoft.pf4j.util.FileUtils;
+import org.pf4j.util.FileUtils;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/CompoundPluginRepository.java b/pf4j/src/main/java/org/pf4j/CompoundPluginRepository.java
index b0341ea..105929c 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/CompoundPluginRepository.java
+++ b/pf4j/src/main/java/org/pf4j/CompoundPluginRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultExtensionFactory.java b/pf4j/src/main/java/org/pf4j/DefaultExtensionFactory.java
index 63d7cee..7a2683b 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultExtensionFactory.java
+++ b/pf4j/src/main/java/org/pf4j/DefaultExtensionFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultExtensionFinder.java b/pf4j/src/main/java/org/pf4j/DefaultExtensionFinder.java
index 4f5f3bb..43a03fb 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultExtensionFinder.java
+++ b/pf4j/src/main/java/org/pf4j/DefaultExtensionFinder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginClasspath.java b/pf4j/src/main/java/org/pf4j/DefaultPluginClasspath.java
index 71631c1..c62f223 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginClasspath.java
+++ b/pf4j/src/main/java/org/pf4j/DefaultPluginClasspath.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 /**
  * The default values are {@code classes} and {@code lib}.
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginDescriptorFinder.java b/pf4j/src/main/java/org/pf4j/DefaultPluginDescriptorFinder.java
index 2696fcd..c803f07 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginDescriptorFinder.java
+++ b/pf4j/src/main/java/org/pf4j/DefaultPluginDescriptorFinder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginFactory.java b/pf4j/src/main/java/org/pf4j/DefaultPluginFactory.java
index 9bc3173..93b0a19 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginFactory.java
+++ b/pf4j/src/main/java/org/pf4j/DefaultPluginFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginLoader.java b/pf4j/src/main/java/org/pf4j/DefaultPluginLoader.java
index e4c6b9f..bdd31eb 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginLoader.java
+++ b/pf4j/src/main/java/org/pf4j/DefaultPluginLoader.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
-import ro.fortsoft.pf4j.util.FileUtils;
+import org.pf4j.util.FileUtils;
 
 import java.io.File;
 import java.nio.file.Path;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java b/pf4j/src/main/java/org/pf4j/DefaultPluginManager.java
index a7aaac5..0d79e82 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java
+++ b/pf4j/src/main/java/org/pf4j/DefaultPluginManager.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
+import org.pf4j.util.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ro.fortsoft.pf4j.util.FileUtils;
 
 import java.io.File;
 import java.nio.file.Path;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginRepository.java b/pf4j/src/main/java/org/pf4j/DefaultPluginRepository.java
index 197ae22..a97313f 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginRepository.java
+++ b/pf4j/src/main/java/org/pf4j/DefaultPluginRepository.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
+import org.pf4j.util.AndFileFilter;
+import org.pf4j.util.DirectoryFileFilter;
+import org.pf4j.util.FileUtils;
+import org.pf4j.util.HiddenFilter;
+import org.pf4j.util.NotFileFilter;
+import org.pf4j.util.OrFileFilter;
+import org.pf4j.util.ZipFileFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ro.fortsoft.pf4j.util.AndFileFilter;
-import ro.fortsoft.pf4j.util.DirectoryFileFilter;
-import ro.fortsoft.pf4j.util.FileUtils;
-import ro.fortsoft.pf4j.util.HiddenFilter;
-import ro.fortsoft.pf4j.util.NameFileFilter;
-import ro.fortsoft.pf4j.util.NotFileFilter;
-import ro.fortsoft.pf4j.util.OrFileFilter;
-import ro.fortsoft.pf4j.util.ZipFileFilter;
+import org.pf4j.util.NameFileFilter;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginStatusProvider.java b/pf4j/src/main/java/org/pf4j/DefaultPluginStatusProvider.java
index 2c669b1..08c4607 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginStatusProvider.java
+++ b/pf4j/src/main/java/org/pf4j/DefaultPluginStatusProvider.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
+import org.pf4j.util.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ro.fortsoft.pf4j.util.FileUtils;
 
 import java.io.IOException;
 import java.nio.file.Path;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultVersionManager.java b/pf4j/src/main/java/org/pf4j/DefaultVersionManager.java
index 0d11e90..96adf56 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultVersionManager.java
+++ b/pf4j/src/main/java/org/pf4j/DefaultVersionManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import com.github.zafarkhaja.semver.Version;
 
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DependencyResolver.java b/pf4j/src/main/java/org/pf4j/DependencyResolver.java
index 0ea15a3..05e8d11 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DependencyResolver.java
+++ b/pf4j/src/main/java/org/pf4j/DependencyResolver.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ro.fortsoft.pf4j.util.DirectedGraph;
+import org.pf4j.util.DirectedGraph;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DevelopmentPluginClasspath.java b/pf4j/src/main/java/org/pf4j/DevelopmentPluginClasspath.java
index ea70f9a..ba22e56 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DevelopmentPluginClasspath.java
+++ b/pf4j/src/main/java/org/pf4j/DevelopmentPluginClasspath.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 /**
  * Overwrite classes directories to {@code target/classes} and lib directories to {@code target/lib}.
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/Extension.java b/pf4j/src/main/java/org/pf4j/Extension.java
index eb8234f..69a2049 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/Extension.java
+++ b/pf4j/src/main/java/org/pf4j/Extension.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/ExtensionDescriptor.java b/pf4j/src/main/java/org/pf4j/ExtensionDescriptor.java
index 4096da5..cb0ebc1 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/ExtensionDescriptor.java
+++ b/pf4j/src/main/java/org/pf4j/ExtensionDescriptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 /**
  * @author Decebal Suiu
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/ExtensionFactory.java b/pf4j/src/main/java/org/pf4j/ExtensionFactory.java
index be8c62f..27ab5cc 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/ExtensionFactory.java
+++ b/pf4j/src/main/java/org/pf4j/ExtensionFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 /**
  * Creates an extension instance.
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/ExtensionFinder.java b/pf4j/src/main/java/org/pf4j/ExtensionFinder.java
index d00e838..146f040 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/ExtensionFinder.java
+++ b/pf4j/src/main/java/org/pf4j/ExtensionFinder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import java.util.List;
 import java.util.Set;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/ExtensionPoint.java b/pf4j/src/main/java/org/pf4j/ExtensionPoint.java
index e01aa65..3e64e72 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/ExtensionPoint.java
+++ b/pf4j/src/main/java/org/pf4j/ExtensionPoint.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 /**
  * @author Decebal Suiu
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/ExtensionWrapper.java b/pf4j/src/main/java/org/pf4j/ExtensionWrapper.java
index f150c0d..50c9612 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/ExtensionWrapper.java
+++ b/pf4j/src/main/java/org/pf4j/ExtensionWrapper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 /**
  * A wrapper over extension instance.
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/JarPluginManager.java b/pf4j/src/main/java/org/pf4j/JarPluginManager.java
index bc66f03..232a8eb 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/JarPluginManager.java
+++ b/pf4j/src/main/java/org/pf4j/JarPluginManager.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
-
-import ro.fortsoft.pf4j.util.AndFileFilter;
-import ro.fortsoft.pf4j.util.DirectoryFileFilter;
-import ro.fortsoft.pf4j.util.HiddenFilter;
-import ro.fortsoft.pf4j.util.JarFileFilter;
-import ro.fortsoft.pf4j.util.NameFileFilter;
-import ro.fortsoft.pf4j.util.NotFileFilter;
-import ro.fortsoft.pf4j.util.OrFileFilter;
+package org.pf4j;
+
+import org.pf4j.util.AndFileFilter;
+import org.pf4j.util.DirectoryFileFilter;
+import org.pf4j.util.HiddenFilter;
+import org.pf4j.util.JarFileFilter;
+import org.pf4j.util.NotFileFilter;
+import org.pf4j.util.OrFileFilter;
+import org.pf4j.util.NameFileFilter;
 
 import java.io.FileFilter;
 import java.io.IOException;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/LegacyExtensionFinder.java b/pf4j/src/main/java/org/pf4j/LegacyExtensionFinder.java
index 6814fa3..da51889 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/LegacyExtensionFinder.java
+++ b/pf4j/src/main/java/org/pf4j/LegacyExtensionFinder.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ro.fortsoft.pf4j.processor.LegacyExtensionStorage;
+import org.pf4j.processor.LegacyExtensionStorage;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/ManifestPluginDescriptorFinder.java b/pf4j/src/main/java/org/pf4j/ManifestPluginDescriptorFinder.java
index a30fb67..1c3b9c2 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/ManifestPluginDescriptorFinder.java
+++ b/pf4j/src/main/java/org/pf4j/ManifestPluginDescriptorFinder.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
-import ro.fortsoft.pf4j.util.StringUtils;
+import org.pf4j.util.StringUtils;
 
 import java.nio.file.Path;
 import java.util.jar.Attributes;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/Plugin.java b/pf4j/src/main/java/org/pf4j/Plugin.java
index 690258f..1972664 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/Plugin.java
+++ b/pf4j/src/main/java/org/pf4j/Plugin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginClassLoader.java b/pf4j/src/main/java/org/pf4j/PluginClassLoader.java
index 4e31fc3..586f1b3 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginClassLoader.java
+++ b/pf4j/src/main/java/org/pf4j/PluginClassLoader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,7 +35,7 @@ public class PluginClassLoader extends URLClassLoader {
 
     private static final Logger log = LoggerFactory.getLogger(PluginClassLoader.class);
 
-	private static final String PLUGIN_PACKAGE_PREFIX = "ro.fortsoft.pf4j.";
+	private static final String PLUGIN_PACKAGE_PREFIX = "org.pf4j.";
 
 	private PluginManager pluginManager;
 	private PluginDescriptor pluginDescriptor;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginClasspath.java b/pf4j/src/main/java/org/pf4j/PluginClasspath.java
index 3a6e99d..06b9ec5 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginClasspath.java
+++ b/pf4j/src/main/java/org/pf4j/PluginClasspath.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDependency.java b/pf4j/src/main/java/org/pf4j/PluginDependency.java
index 44a147f..fa2f280 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDependency.java
+++ b/pf4j/src/main/java/org/pf4j/PluginDependency.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 /**
  * @author Decebal Suiu
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDescriptor.java b/pf4j/src/main/java/org/pf4j/PluginDescriptor.java
index e7bcb89..6dddbbf 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDescriptor.java
+++ b/pf4j/src/main/java/org/pf4j/PluginDescriptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDescriptorFinder.java b/pf4j/src/main/java/org/pf4j/PluginDescriptorFinder.java
index c84adaf..2edfbb5 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDescriptorFinder.java
+++ b/pf4j/src/main/java/org/pf4j/PluginDescriptorFinder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import java.nio.file.Path;
 
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginException.java b/pf4j/src/main/java/org/pf4j/PluginException.java
index 3d4aec4..4a57af4 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginException.java
+++ b/pf4j/src/main/java/org/pf4j/PluginException.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
-import ro.fortsoft.pf4j.util.StringUtils;
+import org.pf4j.util.StringUtils;
 
 /**
  * An exception used to indicate that a plugin problem occurred.
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginFactory.java b/pf4j/src/main/java/org/pf4j/PluginFactory.java
index 85215ee..4909ade 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginFactory.java
+++ b/pf4j/src/main/java/org/pf4j/PluginFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 /**
  * Creates a plugin instance.
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginLoader.java b/pf4j/src/main/java/org/pf4j/PluginLoader.java
index ecd0e08..5ac2755 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginLoader.java
+++ b/pf4j/src/main/java/org/pf4j/PluginLoader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import java.nio.file.Path;
 
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginManager.java b/pf4j/src/main/java/org/pf4j/PluginManager.java
index 793784b..06fc68e 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginManager.java
+++ b/pf4j/src/main/java/org/pf4j/PluginManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import java.nio.file.Path;
 import java.util.List;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginRepository.java b/pf4j/src/main/java/org/pf4j/PluginRepository.java
index 6f57c57..de1347d 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginRepository.java
+++ b/pf4j/src/main/java/org/pf4j/PluginRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import java.nio.file.Path;
 import java.util.List;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginState.java b/pf4j/src/main/java/org/pf4j/PluginState.java
index 8df6a0f..2de2523 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginState.java
+++ b/pf4j/src/main/java/org/pf4j/PluginState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 /**
  * @author Decebal Suiu
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginStateEvent.java b/pf4j/src/main/java/org/pf4j/PluginStateEvent.java
index 0314eae..361fd3f 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginStateEvent.java
+++ b/pf4j/src/main/java/org/pf4j/PluginStateEvent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import java.util.EventObject;
 
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginStateListener.java b/pf4j/src/main/java/org/pf4j/PluginStateListener.java
index 99e2fec..5312b1b 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginStateListener.java
+++ b/pf4j/src/main/java/org/pf4j/PluginStateListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import java.util.EventListener;
 
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginStatusProvider.java b/pf4j/src/main/java/org/pf4j/PluginStatusProvider.java
index 4943530..07d5f43 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginStatusProvider.java
+++ b/pf4j/src/main/java/org/pf4j/PluginStatusProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 /**
  * @author Decebal Suiu
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginWrapper.java b/pf4j/src/main/java/org/pf4j/PluginWrapper.java
index e594f68..5ed641f 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginWrapper.java
+++ b/pf4j/src/main/java/org/pf4j/PluginWrapper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import java.nio.file.Path;
 
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PropertiesPluginDescriptorFinder.java b/pf4j/src/main/java/org/pf4j/PropertiesPluginDescriptorFinder.java
index 259040c..0391bce 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PropertiesPluginDescriptorFinder.java
+++ b/pf4j/src/main/java/org/pf4j/PropertiesPluginDescriptorFinder.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ro.fortsoft.pf4j.util.StringUtils;
+import org.pf4j.util.StringUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/RuntimeMode.java b/pf4j/src/main/java/org/pf4j/RuntimeMode.java
index 1ceb6d9..f4bec88 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/RuntimeMode.java
+++ b/pf4j/src/main/java/org/pf4j/RuntimeMode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/ServiceProviderExtensionFinder.java b/pf4j/src/main/java/org/pf4j/ServiceProviderExtensionFinder.java
index 4912507..bd7c768 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/ServiceProviderExtensionFinder.java
+++ b/pf4j/src/main/java/org/pf4j/ServiceProviderExtensionFinder.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
+import org.pf4j.processor.ServiceProviderExtensionStorage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ro.fortsoft.pf4j.processor.ServiceProviderExtensionStorage;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/VersionManager.java b/pf4j/src/main/java/org/pf4j/VersionManager.java
index c3de913..ae9187b 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/VersionManager.java
+++ b/pf4j/src/main/java/org/pf4j/VersionManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 /**
  * Manager responsible for versions of plugins.
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/processor/ExtensionAnnotationProcessor.java b/pf4j/src/main/java/org/pf4j/processor/ExtensionAnnotationProcessor.java
index 5174f64..30c604c 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/processor/ExtensionAnnotationProcessor.java
+++ b/pf4j/src/main/java/org/pf4j/processor/ExtensionAnnotationProcessor.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.processor;
+package org.pf4j.processor;
 
-import ro.fortsoft.pf4j.Extension;
-import ro.fortsoft.pf4j.ExtensionPoint;
+import org.pf4j.Extension;
+import org.pf4j.ExtensionPoint;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.ProcessingEnvironment;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/processor/ExtensionStorage.java b/pf4j/src/main/java/org/pf4j/processor/ExtensionStorage.java
index d184ea7..55394b7 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/processor/ExtensionStorage.java
+++ b/pf4j/src/main/java/org/pf4j/processor/ExtensionStorage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.processor;
+package org.pf4j.processor;
 
 import javax.annotation.processing.Filer;
 import javax.lang.model.element.Element;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/processor/LegacyExtensionStorage.java b/pf4j/src/main/java/org/pf4j/processor/LegacyExtensionStorage.java
index 15d417a..d664e4e 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/processor/LegacyExtensionStorage.java
+++ b/pf4j/src/main/java/org/pf4j/processor/LegacyExtensionStorage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.processor;
+package org.pf4j.processor;
 
 import javax.annotation.processing.FilerException;
 import javax.tools.FileObject;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/processor/ServiceProviderExtensionStorage.java b/pf4j/src/main/java/org/pf4j/processor/ServiceProviderExtensionStorage.java
index 054dcdd..135063f 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/processor/ServiceProviderExtensionStorage.java
+++ b/pf4j/src/main/java/org/pf4j/processor/ServiceProviderExtensionStorage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.processor;
+package org.pf4j.processor;
 
 import javax.annotation.processing.FilerException;
 import javax.tools.FileObject;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/AndFileFilter.java b/pf4j/src/main/java/org/pf4j/util/AndFileFilter.java
index b076a69..0add9f4 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/AndFileFilter.java
+++ b/pf4j/src/main/java/org/pf4j/util/AndFileFilter.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 /**
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/ClassUtils.java b/pf4j/src/main/java/org/pf4j/util/ClassUtils.java
index b435c2f..ca2632d 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/ClassUtils.java
+++ b/pf4j/src/main/java/org/pf4j/util/ClassUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/DirectedGraph.java b/pf4j/src/main/java/org/pf4j/util/DirectedGraph.java
index 8970c78..bc2b8fb 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/DirectedGraph.java
+++ b/pf4j/src/main/java/org/pf4j/util/DirectedGraph.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/DirectoryFileFilter.java b/pf4j/src/main/java/org/pf4j/util/DirectoryFileFilter.java
index 05cce35..fab20fa 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/DirectoryFileFilter.java
+++ b/pf4j/src/main/java/org/pf4j/util/DirectoryFileFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/ExtensionFileFilter.java b/pf4j/src/main/java/org/pf4j/util/ExtensionFileFilter.java
index 8146f5f..a8636fc 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/ExtensionFileFilter.java
+++ b/pf4j/src/main/java/org/pf4j/util/ExtensionFileFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/FileUtils.java b/pf4j/src/main/java/org/pf4j/util/FileUtils.java
index 6ce7f42..9399588 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/FileUtils.java
+++ b/pf4j/src/main/java/org/pf4j/util/FileUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/HiddenFilter.java b/pf4j/src/main/java/org/pf4j/util/HiddenFilter.java
index f18372a..649e8e0 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/HiddenFilter.java
+++ b/pf4j/src/main/java/org/pf4j/util/HiddenFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/JarFileFilter.java b/pf4j/src/main/java/org/pf4j/util/JarFileFilter.java
index d947c34..f015850 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/JarFileFilter.java
+++ b/pf4j/src/main/java/org/pf4j/util/JarFileFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 /**
  * File filter that accepts all files ending with .JAR.
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/NameFileFilter.java b/pf4j/src/main/java/org/pf4j/util/NameFileFilter.java
index 9071882..c114352 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/NameFileFilter.java
+++ b/pf4j/src/main/java/org/pf4j/util/NameFileFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/NotFileFilter.java b/pf4j/src/main/java/org/pf4j/util/NotFileFilter.java
index c30ce40..06f6140 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/NotFileFilter.java
+++ b/pf4j/src/main/java/org/pf4j/util/NotFileFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/OrFileFilter.java b/pf4j/src/main/java/org/pf4j/util/OrFileFilter.java
index 33e3e83..8bf3f24 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/OrFileFilter.java
+++ b/pf4j/src/main/java/org/pf4j/util/OrFileFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/StringUtils.java b/pf4j/src/main/java/org/pf4j/util/StringUtils.java
index 62afecc..49657d5 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/StringUtils.java
+++ b/pf4j/src/main/java/org/pf4j/util/StringUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 /**
  * @author Decebal Suiu
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/Unzip.java b/pf4j/src/main/java/org/pf4j/util/Unzip.java
index bcf6c9d..5d0c34a 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/Unzip.java
+++ b/pf4j/src/main/java/org/pf4j/util/Unzip.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/ZipFileFilter.java b/pf4j/src/main/java/org/pf4j/util/ZipFileFilter.java
index 08913a0..d4748e6 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/ZipFileFilter.java
+++ b/pf4j/src/main/java/org/pf4j/util/ZipFileFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 /**
  * File filter that accepts all files ending with .ZIP.
diff --git a/pf4j/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/pf4j/src/main/resources/META-INF/services/javax.annotation.processing.Processor
index c616e6e..164832f 100644
--- a/pf4j/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ b/pf4j/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-ro.fortsoft.pf4j.processor.ExtensionAnnotationProcessor
+org.pf4j.processor.ExtensionAnnotationProcessor
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/AbstractExtensionFinderTest.java b/pf4j/src/test/java/org/pf4j/AbstractExtensionFinderTest.java
index 47a1b20..9e1c40e 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/AbstractExtensionFinderTest.java
+++ b/pf4j/src/test/java/org/pf4j/AbstractExtensionFinderTest.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import ro.fortsoft.pf4j.plugin.FailTestPlugin;
-import ro.fortsoft.pf4j.plugin.TestExtensionPoint;
+import org.pf4j.plugin.FailTestPlugin;
+import org.pf4j.plugin.TestExtensionPoint;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -101,8 +101,8 @@ public class AbstractExtensionFinderTest {
                 Map<String, Set<String>> entries = new LinkedHashMap<>();
 
                 Set<String> bucket = new HashSet<>();
-                bucket.add("ro.fortsoft.pf4j.plugin.TestExtension");
-                bucket.add("ro.fortsoft.pf4j.plugin.FailTestExtension");
+                bucket.add("org.pf4j.plugin.TestExtension");
+                bucket.add("org.pf4j.plugin.FailTestExtension");
                 entries.put(null, bucket);
 
                 return entries;
@@ -126,11 +126,11 @@ public class AbstractExtensionFinderTest {
                 Map<String, Set<String>> entries = new LinkedHashMap<>();
 
                 Set<String> bucket = new HashSet<>();
-                bucket.add("ro.fortsoft.pf4j.plugin.TestExtension");
-                bucket.add("ro.fortsoft.pf4j.plugin.FailTestExtension");
+                bucket.add("org.pf4j.plugin.TestExtension");
+                bucket.add("org.pf4j.plugin.FailTestExtension");
                 entries.put("plugin1", bucket);
                 bucket = new HashSet<>();
-                bucket.add("ro.fortsoft.pf4j.plugin.TestExtension");
+                bucket.add("org.pf4j.plugin.TestExtension");
                 entries.put("plugin2", bucket);
 
                 return entries;
@@ -165,7 +165,7 @@ public class AbstractExtensionFinderTest {
                 Map<String, Set<String>> entries = new LinkedHashMap<>();
 
                 Set<String> bucket = new HashSet<>();
-                bucket.add("ro.fortsoft.pf4j.plugin.TestExtension");
+                bucket.add("org.pf4j.plugin.TestExtension");
                 entries.put("plugin1", bucket);
 
                 return entries;
@@ -176,8 +176,8 @@ public class AbstractExtensionFinderTest {
                 Map<String, Set<String>> entries = new LinkedHashMap<>();
 
                 Set<String> bucket = new HashSet<>();
-                bucket.add("ro.fortsoft.pf4j.plugin.TestExtension");
-                bucket.add("ro.fortsoft.pf4j.plugin.FailTestExtension");
+                bucket.add("org.pf4j.plugin.TestExtension");
+                bucket.add("org.pf4j.plugin.FailTestExtension");
                 entries.put(null, bucket);
 
                 return entries;
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/DefaultExtensionFactoryTest.java b/pf4j/src/test/java/org/pf4j/DefaultExtensionFactoryTest.java
index 28a4495..01822d0 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/DefaultExtensionFactoryTest.java
+++ b/pf4j/src/test/java/org/pf4j/DefaultExtensionFactoryTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.junit.Test;
-import ro.fortsoft.pf4j.plugin.FailTestExtension;
-import ro.fortsoft.pf4j.plugin.TestExtension;
+import org.pf4j.plugin.TestExtension;
+import org.pf4j.plugin.FailTestExtension;
 
 import static org.junit.Assert.*;
 
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/DefaultPluginFactoryTest.java b/pf4j/src/test/java/org/pf4j/DefaultPluginFactoryTest.java
index aef1fcc..5735328 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/DefaultPluginFactoryTest.java
+++ b/pf4j/src/test/java/org/pf4j/DefaultPluginFactoryTest.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.junit.Test;
-import ro.fortsoft.pf4j.plugin.AnotherFailTestPlugin;
-import ro.fortsoft.pf4j.plugin.FailTestPlugin;
-import ro.fortsoft.pf4j.plugin.TestPlugin;
+import org.pf4j.plugin.FailTestPlugin;
+import org.pf4j.plugin.TestPlugin;
+import org.pf4j.plugin.AnotherFailTestPlugin;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.assertNotNull;
@@ -76,7 +76,7 @@ public class DefaultPluginFactoryTest {
     @Test
     public void testCreateFailNotFound() {
         PluginDescriptor pluginDescriptor = mock(PluginDescriptor.class);
-        when(pluginDescriptor.getPluginClass()).thenReturn("ro.fortsoft.pf4j.plugin.NotFoundTestPlugin");
+        when(pluginDescriptor.getPluginClass()).thenReturn("org.pf4j.plugin.NotFoundTestPlugin");
 
         PluginWrapper pluginWrapper = mock(PluginWrapper.class);
         when(pluginWrapper.getDescriptor()).thenReturn(pluginDescriptor);
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/DefaultPluginManagerTest.java b/pf4j/src/test/java/org/pf4j/DefaultPluginManagerTest.java
index 4c154d1..03f8496 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/DefaultPluginManagerTest.java
+++ b/pf4j/src/test/java/org/pf4j/DefaultPluginManagerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/DefaultPluginRepositoryTest.java b/pf4j/src/test/java/org/pf4j/DefaultPluginRepositoryTest.java
index 95c153b..b66b3b5 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/DefaultPluginRepositoryTest.java
+++ b/pf4j/src/test/java/org/pf4j/DefaultPluginRepositoryTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/DefaultPluginStatusProviderTest.java b/pf4j/src/test/java/org/pf4j/DefaultPluginStatusProviderTest.java
index db33d65..da2752e 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/DefaultPluginStatusProviderTest.java
+++ b/pf4j/src/test/java/org/pf4j/DefaultPluginStatusProviderTest.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import ro.fortsoft.pf4j.util.FileUtils;
+import org.pf4j.util.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/DefaultVersionManagerTest.java b/pf4j/src/test/java/org/pf4j/DefaultVersionManagerTest.java
index 802291d..aaa5fa9 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/DefaultVersionManagerTest.java
+++ b/pf4j/src/test/java/org/pf4j/DefaultVersionManagerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import com.github.zafarkhaja.semver.ParseException;
 import org.junit.Before;
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/DependencyResolverTest.java b/pf4j/src/test/java/org/pf4j/DependencyResolverTest.java
index 14aba39..44d2c93 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/DependencyResolverTest.java
+++ b/pf4j/src/test/java/org/pf4j/DependencyResolverTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/ExtensionAnnotationProcessorTest.java b/pf4j/src/test/java/org/pf4j/ExtensionAnnotationProcessorTest.java
index 1c99396..c2e7c0e 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/ExtensionAnnotationProcessorTest.java
+++ b/pf4j/src/test/java/org/pf4j/ExtensionAnnotationProcessorTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.junit.Test;
-import ro.fortsoft.pf4j.processor.ExtensionAnnotationProcessor;
+import org.pf4j.processor.ExtensionAnnotationProcessor;
 
 import java.util.Set;
 
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/LegacyExtensionStorageTest.java b/pf4j/src/test/java/org/pf4j/LegacyExtensionStorageTest.java
index aeeb371..14daa6e 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/LegacyExtensionStorageTest.java
+++ b/pf4j/src/test/java/org/pf4j/LegacyExtensionStorageTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.junit.Test;
-import ro.fortsoft.pf4j.processor.LegacyExtensionStorage;
+import org.pf4j.processor.LegacyExtensionStorage;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -38,9 +38,9 @@ public class LegacyExtensionStorageTest {
     public void testRead() throws IOException {
         Reader reader = new StringReader(
             "# comment\n"
-                + "ro.fortsoft.pf4j.demo.hello.HelloPlugin$HelloGreeting\n"
-                + "ro.fortsoft.pf4j.demo.welcome.WelcomePlugin$WelcomeGreeting\n"
-                + "ro.fortsoft.pf4j.demo.welcome.OtherGreeting\n");
+                + "org.pf4j.demo.hello.HelloPlugin$HelloGreeting\n"
+                + "org.pf4j.demo.welcome.WelcomePlugin$WelcomeGreeting\n"
+                + "org.pf4j.demo.welcome.OtherGreeting\n");
 
         Set<String> entries = new HashSet<>();
         LegacyExtensionStorage.read(reader, entries);
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/LoadPluginsTest.java b/pf4j/src/test/java/org/pf4j/LoadPluginsTest.java
index 9ee9899..5c46d66 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/LoadPluginsTest.java
+++ b/pf4j/src/test/java/org/pf4j/LoadPluginsTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.junit.Before;
 import org.junit.Test;
-import ro.fortsoft.pf4j.plugin.MockPluginManager;
+import org.pf4j.plugin.MockPluginManager;
 
 import java.io.BufferedWriter;
 import java.io.FileWriter;
@@ -161,7 +161,7 @@ public class LoadPluginsTest {
                 br.newLine();
                 br.write("plugin.version=" + version);
                 br.newLine();
-                br.write("plugin.class=ro.fortsoft.pf4j.plugin.TestPlugin");
+                br.write("plugin.class=org.pf4j.plugin.TestPlugin");
                 br.close();
                 Files.move(propsFile, propsInZip);
             }
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/ManifestPluginDescriptorFinderTest.java b/pf4j/src/test/java/org/pf4j/ManifestPluginDescriptorFinderTest.java
index c858767..8c19733 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/ManifestPluginDescriptorFinderTest.java
+++ b/pf4j/src/test/java/org/pf4j/ManifestPluginDescriptorFinderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -45,11 +45,11 @@ public class ManifestPluginDescriptorFinderTest {
         Charset charset = Charset.forName("UTF-8");
 
         Path pluginPath = testFolder.newFolder("test-plugin-1", "classes", "META-INF").toPath();
-        Files.write(pluginPath.resolve("extensions.idx"), "ro.fortsoft.pf4j.demo.hello.HelloPlugin$HelloGreeting".getBytes());
+        Files.write(pluginPath.resolve("extensions.idx"), "org.pf4j.demo.hello.HelloPlugin$HelloGreeting".getBytes());
         Files.write(pluginPath.resolve("MANIFEST.MF"), getPlugin1Manifest(), charset);
 
         pluginPath = testFolder.newFolder("test-plugin-2", "classes", "META-INF").toPath();
-        Files.write(pluginPath.resolve("extensions.idx"), "ro.fortsoft.pf4j.demo.hello.HelloPlugin$HelloGreeting".getBytes());
+        Files.write(pluginPath.resolve("extensions.idx"), "org.pf4j.demo.hello.HelloPlugin$HelloGreeting".getBytes());
         Files.write(pluginPath.resolve("MANIFEST.MF"), getPlugin2Manifest(), charset);
 
         // empty plugin
@@ -57,17 +57,17 @@ public class ManifestPluginDescriptorFinderTest {
 
         // no plugin class
         pluginPath = testFolder.newFolder("test-plugin-4", "classes", "META-INF").toPath();
-        Files.write(pluginPath.resolve("extensions.idx"), "ro.fortsoft.pf4j.demo.hello.HelloPlugin$HelloGreeting".getBytes());
+        Files.write(pluginPath.resolve("extensions.idx"), "org.pf4j.demo.hello.HelloPlugin$HelloGreeting".getBytes());
         Files.write(pluginPath.resolve("MANIFEST.MF"), getPlugin4Manifest(), charset);
 
         // no plugin version
         pluginPath = testFolder.newFolder("test-plugin-5", "classes", "META-INF").toPath();
-        Files.write(pluginPath.resolve("extensions.idx"), "ro.fortsoft.pf4j.demo.hello.HelloPlugin$HelloGreeting".getBytes());
+        Files.write(pluginPath.resolve("extensions.idx"), "org.pf4j.demo.hello.HelloPlugin$HelloGreeting".getBytes());
         Files.write(pluginPath.resolve("MANIFEST.MF"), getPlugin5Manifest(), charset);
 
         // no plugin id
         pluginPath = testFolder.newFolder("test-plugin-6", "classes", "META-INF").toPath();
-        Files.write(pluginPath.resolve("extensions.idx"), "ro.fortsoft.pf4j.demo.hello.HelloPlugin$HelloGreeting".getBytes());
+        Files.write(pluginPath.resolve("extensions.idx"), "org.pf4j.demo.hello.HelloPlugin$HelloGreeting".getBytes());
         Files.write(pluginPath.resolve("MANIFEST.MF"), getPlugin6Manifest(), charset);
 
         versionManager = new DefaultVersionManager();
@@ -85,7 +85,7 @@ public class ManifestPluginDescriptorFinderTest {
 
         assertEquals("test-plugin-1", plugin1.getPluginId());
         assertEquals("Test Plugin 1", plugin1.getPluginDescription());
-        assertEquals("ro.fortsoft.pf4j.plugin.TestPlugin", plugin1.getPluginClass());
+        assertEquals("org.pf4j.plugin.TestPlugin", plugin1.getPluginClass());
         assertEquals("0.0.1", plugin1.getVersion());
         assertEquals("Decebal Suiu", plugin1.getProvider());
         assertEquals(2, plugin1.getDependencies().size());
@@ -97,7 +97,7 @@ public class ManifestPluginDescriptorFinderTest {
 
         assertEquals("test-plugin-2", plugin2.getPluginId());
         assertEquals("", plugin2.getPluginDescription());
-        assertEquals("ro.fortsoft.pf4j.plugin.TestPlugin", plugin2.getPluginClass());
+        assertEquals("org.pf4j.plugin.TestPlugin", plugin2.getPluginClass());
         assertEquals("0.0.1", plugin2.getVersion());
         assertEquals("Decebal Suiu", plugin2.getProvider());
         assertEquals(0, plugin2.getDependencies().size());
@@ -121,12 +121,12 @@ public class ManifestPluginDescriptorFinderTest {
             + "Archiver-Version: Plexus Archiver\n"
             + "Built-By: Mario Franco\n"
             + "Specification-Title: Test Plugin #1\n"
-            + "Implementation-Vendor-Id: ro.fortsoft.pf4j.demo\n"
+            + "Implementation-Vendor-Id: org.pf4j.demo\n"
             + "Plugin-Version: 0.0.1\n"
             + "Plugin-Id: test-plugin-1\n"
             + "Plugin-Description: Test Plugin 1\n"
             + "Plugin-Provider: Decebal Suiu\n"
-            + "Plugin-Class: ro.fortsoft.pf4j.plugin.TestPlugin\n"
+            + "Plugin-Class: org.pf4j.plugin.TestPlugin\n"
             + "Plugin-Dependencies: test-plugin-2,test-plugin-3@~1.0\n"
             + "Plugin-Requires: *\n"
             + "Plugin-License: Apache-2.0\n"
@@ -149,11 +149,11 @@ public class ManifestPluginDescriptorFinderTest {
             + "Archiver-Version: Plexus Archiver\n"
             + "Built-By: Mario Franco\n"
             + "Specification-Title: Test Plugin #2\n"
-            + "Implementation-Vendor-Id: ro.fortsoft.pf4j.demo\n"
+            + "Implementation-Vendor-Id: org.pf4j.demo\n"
             + "Plugin-Version: 0.0.1\n"
             + "Plugin-Id: test-plugin-2\n"
             + "Plugin-Provider: Decebal Suiu\n"
-            + "Plugin-Class: ro.fortsoft.pf4j.plugin.TestPlugin\n"
+            + "Plugin-Class: org.pf4j.plugin.TestPlugin\n"
             + "Created-By: Apache Maven 3.0.5\n"
             + "Build-Jdk: 1.8.0_45\n"
             + "Specification-Version: 0.10.0-SNAPSHOT\n"
@@ -172,7 +172,7 @@ public class ManifestPluginDescriptorFinderTest {
             + "Archiver-Version: Plexus Archiver\n"
             + "Built-By: Mario Franco\n"
             + "Specification-Title: Test Plugin #4\n"
-            + "Implementation-Vendor-Id: ro.fortsoft.pf4j.demo\n"
+            + "Implementation-Vendor-Id: org.pf4j.demo\n"
             + "Plugin-Version: 0.0.1\n"
             + "Plugin-Id: test-plugin-2\n"
             + "Plugin-Provider: Decebal Suiu\n"
@@ -194,10 +194,10 @@ public class ManifestPluginDescriptorFinderTest {
             + "Archiver-Version: Plexus Archiver\n"
             + "Built-By: Mario Franco\n"
             + "Specification-Title: Test Plugin #5\n"
-            + "Implementation-Vendor-Id: ro.fortsoft.pf4j.demo\n"
+            + "Implementation-Vendor-Id: org.pf4j.demo\n"
             + "Plugin-Id: test-plugin-2\n"
             + "Plugin-Provider: Decebal Suiu\n"
-            + "Plugin-Class: ro.fortsoft.pf4j.plugin.TestPlugin\n"
+            + "Plugin-Class: org.pf4j.plugin.TestPlugin\n"
             + "Created-By: Apache Maven 3.0.5\n"
             + "Build-Jdk: 1.8.0_45\n"
             + "Specification-Version: 0.10.0-SNAPSHOT\n"
@@ -216,9 +216,9 @@ public class ManifestPluginDescriptorFinderTest {
             + "Archiver-Version: Plexus Archiver\n"
             + "Built-By: Mario Franco\n"
             + "Specification-Title: Test Plugin #6\n"
-            + "Implementation-Vendor-Id: ro.fortsoft.pf4j.demo\n"
+            + "Implementation-Vendor-Id: org.pf4j.demo\n"
             + "Plugin-Provider: Decebal Suiu\n"
-            + "Plugin-Class: ro.fortsoft.pf4j.plugin.TestPlugin\n"
+            + "Plugin-Class: org.pf4j.plugin.TestPlugin\n"
             + "Created-By: Apache Maven 3.0.5\n"
             + "Build-Jdk: 1.8.0_45\n"
             + "Specification-Version: 0.10.0-SNAPSHOT\n"
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/PluginDependencyTest.java b/pf4j/src/test/java/org/pf4j/PluginDependencyTest.java
index 9304e57..f65ee51 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/PluginDependencyTest.java
+++ b/pf4j/src/test/java/org/pf4j/PluginDependencyTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.junit.Test;
 
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/PropertiesPluginDescriptorFinderTest.java b/pf4j/src/test/java/org/pf4j/PropertiesPluginDescriptorFinderTest.java
index aa6d7c5..e308f59 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/PropertiesPluginDescriptorFinderTest.java
+++ b/pf4j/src/test/java/org/pf4j/PropertiesPluginDescriptorFinderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j;
+package org.pf4j;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -73,7 +73,7 @@ public class PropertiesPluginDescriptorFinderTest {
 
         assertEquals("test-plugin-1", plugin1.getPluginId());
         assertEquals("Test Plugin 1", plugin1.getPluginDescription());
-        assertEquals("ro.fortsoft.pf4j.plugin.TestPlugin", plugin1.getPluginClass());
+        assertEquals("org.pf4j.plugin.TestPlugin", plugin1.getPluginClass());
         assertEquals("0.0.1", plugin1.getVersion());
         assertEquals("Decebal Suiu", plugin1.getProvider());
         assertEquals(2, plugin1.getDependencies().size());
@@ -87,7 +87,7 @@ public class PropertiesPluginDescriptorFinderTest {
 
         assertEquals("test-plugin-2", plugin2.getPluginId());
         assertEquals("", plugin2.getPluginDescription());
-        assertEquals("ro.fortsoft.pf4j.plugin.TestPlugin", plugin2.getPluginClass());
+        assertEquals("org.pf4j.plugin.TestPlugin", plugin2.getPluginClass());
         assertEquals("0.0.1", plugin2.getVersion());
         assertEquals("Decebal Suiu", plugin2.getProvider());
         assertEquals(0, plugin2.getDependencies().size());
@@ -107,7 +107,7 @@ public class PropertiesPluginDescriptorFinderTest {
             + "plugin.version=0.0.1\n"
             + "plugin.description=Test Plugin 1\n"
             + "plugin.provider=Decebal Suiu\n"
-            + "plugin.class=ro.fortsoft.pf4j.plugin.TestPlugin\n"
+            + "plugin.class=org.pf4j.plugin.TestPlugin\n"
             + "plugin.dependencies=test-plugin-2,test-plugin-3@~1.0\n"
             + "plugin.requires=>=1\n"
             + "plugin.license=Apache-2.0\n"
@@ -123,7 +123,7 @@ public class PropertiesPluginDescriptorFinderTest {
             "plugin.id=test-plugin-2\n"
             + "plugin.version=0.0.1\n"
             + "plugin.provider=Decebal Suiu\n"
-            + "plugin.class=ro.fortsoft.pf4j.plugin.TestPlugin\n"
+            + "plugin.class=org.pf4j.plugin.TestPlugin\n"
             + "plugin.dependencies=\n"
             + "\n"
             + ""
@@ -150,7 +150,7 @@ public class PropertiesPluginDescriptorFinderTest {
         String[] lines = new String[] {
             "plugin.id=test-plugin-2\n"
             + "plugin.provider=Decebal Suiu\n"
-            + "plugin.class=ro.fortsoft.pf4j.plugin.TestPlugin\n"
+            + "plugin.class=org.pf4j.plugin.TestPlugin\n"
             + "plugin.dependencies=\n"
             + "plugin.requires=*\n"
             + "\n"
@@ -164,7 +164,7 @@ public class PropertiesPluginDescriptorFinderTest {
         String[] lines = new String[] {
             "plugin.version=0.0.1\n"
             + "plugin.provider=Decebal Suiu\n"
-            + "plugin.class=ro.fortsoft.pf4j.plugin.TestPlugin\n"
+            + "plugin.class=org.pf4j.plugin.TestPlugin\n"
             + "plugin.dependencies=\n"
             + "plugin.requires=*\n"
             + "\n"
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/AnotherFailTestPlugin.java b/pf4j/src/test/java/org/pf4j/plugin/AnotherFailTestPlugin.java
index 5cfe611..aa124ad 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/AnotherFailTestPlugin.java
+++ b/pf4j/src/test/java/org/pf4j/plugin/AnotherFailTestPlugin.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.plugin;
+package org.pf4j.plugin;
 
-import ro.fortsoft.pf4j.Plugin;
+import org.pf4j.Plugin;
 
 /**
  *
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/FailTestExtension.java b/pf4j/src/test/java/org/pf4j/plugin/FailTestExtension.java
index 3832b7f..2fa6062 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/FailTestExtension.java
+++ b/pf4j/src/test/java/org/pf4j/plugin/FailTestExtension.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.plugin;
+package org.pf4j.plugin;
 
-import ro.fortsoft.pf4j.Extension;
+import org.pf4j.Extension;
 
 /**
  * @author Mario Franco
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/FailTestPlugin.java b/pf4j/src/test/java/org/pf4j/plugin/FailTestPlugin.java
index 0f4ba65..c53ae38 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/FailTestPlugin.java
+++ b/pf4j/src/test/java/org/pf4j/plugin/FailTestPlugin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.plugin;
+package org.pf4j.plugin;
 
 /**
  *
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/MockPluginManager.java b/pf4j/src/test/java/org/pf4j/plugin/MockPluginManager.java
index 139a0e8..eb1956d 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/MockPluginManager.java
+++ b/pf4j/src/test/java/org/pf4j/plugin/MockPluginManager.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.plugin;
+package org.pf4j.plugin;
 
-import ro.fortsoft.pf4j.DefaultPluginClasspath;
-import ro.fortsoft.pf4j.DefaultPluginDescriptorFinder;
-import ro.fortsoft.pf4j.DefaultPluginManager;
-import ro.fortsoft.pf4j.PluginDescriptorFinder;
+import org.pf4j.DefaultPluginClasspath;
+import org.pf4j.DefaultPluginDescriptorFinder;
+import org.pf4j.DefaultPluginManager;
+import org.pf4j.PluginDescriptorFinder;
 
 import java.nio.file.Path;
 
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/TestExtension.java b/pf4j/src/test/java/org/pf4j/plugin/TestExtension.java
index 181e90d..9134358 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/TestExtension.java
+++ b/pf4j/src/test/java/org/pf4j/plugin/TestExtension.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.plugin;
+package org.pf4j.plugin;
 
-import ro.fortsoft.pf4j.Extension;
+import org.pf4j.Extension;
 
 /**
  * @author Mario Franco
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/TestExtensionPoint.java b/pf4j/src/test/java/org/pf4j/plugin/TestExtensionPoint.java
index 3c1ee1e..f8a1a64 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/TestExtensionPoint.java
+++ b/pf4j/src/test/java/org/pf4j/plugin/TestExtensionPoint.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.plugin;
+package org.pf4j.plugin;
 
-import ro.fortsoft.pf4j.ExtensionPoint;
+import org.pf4j.ExtensionPoint;
 
 /**
  * @author Mario Franco
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/TestPlugin.java b/pf4j/src/test/java/org/pf4j/plugin/TestPlugin.java
index 3557a16..f0f8c87 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/plugin/TestPlugin.java
+++ b/pf4j/src/test/java/org/pf4j/plugin/TestPlugin.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.plugin;
+package org.pf4j.plugin;
 
-import ro.fortsoft.pf4j.Plugin;
-import ro.fortsoft.pf4j.PluginWrapper;
+import org.pf4j.Plugin;
+import org.pf4j.PluginWrapper;
 
 /**
  *
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/util/FileUtilsTest.java b/pf4j/src/test/java/org/pf4j/util/FileUtilsTest.java
index 6b98549..6b52fdf 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/util/FileUtilsTest.java
+++ b/pf4j/src/test/java/org/pf4j/util/FileUtilsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package ro.fortsoft.pf4j.util;
+package org.pf4j.util;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/pf4j/src/test/resources/log4j.properties b/pf4j/src/test/resources/log4j.properties
index 0454ba2..7edd29c 100644
--- a/pf4j/src/test/resources/log4j.properties
+++ b/pf4j/src/test/resources/log4j.properties
@@ -3,13 +3,13 @@ log4j.rootLogger=DEBUG, Console
 #
 # PF4J log
 #
-log4j.logger.ro.fortsoft.pf4j=DEBUG, Console
+log4j.logger.org.pf4j=DEBUG, Console
 # !!! Put the bellow classes on level TRACE when you are in trouble
-log4j.logger.ro.fortsoft.pf4j.PluginClassLoader=WARN, Console
-log4j.logger.ro.fortsoft.pf4j.AbstractExtensionFinder=DEBUG, Console
-log4j.additivity.ro.fortsoft.pf4j=false
-log4j.additivity.ro.fortsoft.pf4j.PluginClassLoader=false
-log4j.additivity.ro.fortsoft.pf4j.AbstractExtensionFinder=false
+log4j.logger.org.pf4j.PluginClassLoader=WARN, Console
+log4j.logger.org.pf4j.AbstractExtensionFinder=DEBUG, Console
+log4j.additivity.org.pf4j=false
+log4j.additivity.org.pf4j.PluginClassLoader=false
+log4j.additivity.org.pf4j.AbstractExtensionFinder=false
 
 #
 # Appenders