diff --git a/scm-annotations/src/main/java/sonia/scm/plugin/ext/Extension.java b/scm-annotations/src/main/java/sonia/scm/plugin/Extension.java
similarity index 98%
rename from scm-annotations/src/main/java/sonia/scm/plugin/ext/Extension.java
rename to scm-annotations/src/main/java/sonia/scm/plugin/Extension.java
index 59e4ca704e..c25b901975 100644
--- a/scm-annotations/src/main/java/sonia/scm/plugin/ext/Extension.java
+++ b/scm-annotations/src/main/java/sonia/scm/plugin/Extension.java
@@ -31,7 +31,7 @@
 
 
 
-package sonia.scm.plugin.ext;
+package sonia.scm.plugin;
 
 //~--- non-JDK imports --------------------------------------------------------
 
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
index 2448785e80..9cf2bc638b 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
@@ -42,7 +42,7 @@ import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 
 import sonia.scm.Type;
 import sonia.scm.io.FileSystem;
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 import sonia.scm.repository.spi.GitRepositoryServiceProvider;
 import sonia.scm.store.StoreFactory;
 
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceResolver.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceResolver.java
index da46605cd7..70609eee87 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceResolver.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceResolver.java
@@ -36,7 +36,7 @@ package sonia.scm.repository.spi;
 
 import com.google.inject.Inject;
 
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 import sonia.scm.repository.GitRepositoryHandler;
 import sonia.scm.repository.Repository;
 
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitContextListener.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitContextListener.java
index b74359fade..6cfc07de46 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitContextListener.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitContextListener.java
@@ -42,7 +42,7 @@ import org.eclipse.jgit.transport.Transport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 
 //~--- JDK imports ------------------------------------------------------------
 
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitServletModule.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitServletModule.java
index fdb1ae52d9..3dbc9fc586 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitServletModule.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitServletModule.java
@@ -39,7 +39,7 @@ import com.google.inject.servlet.ServletModule;
 
 import org.eclipse.jgit.transport.ScmTransportProtocol;
 
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 
 /**
  *
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
index 07e26f73ad..e3ae8afb78 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
@@ -54,7 +54,7 @@ import sonia.scm.io.INIConfiguration;
 import sonia.scm.io.INIConfigurationReader;
 import sonia.scm.io.INIConfigurationWriter;
 import sonia.scm.io.INISection;
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 import sonia.scm.repository.spi.HgRepositoryServiceProvider;
 import sonia.scm.store.StoreFactory;
 import sonia.scm.util.IOUtil;
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java
index c98acf0f78..9b87991ae6 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java
@@ -37,7 +37,7 @@ package sonia.scm.repository.spi;
 
 import com.google.inject.Inject;
 
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 import sonia.scm.repository.HgHookManager;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.Repository;
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletModule.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletModule.java
index 5bf080860a..dcdd4c4246 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletModule.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletModule.java
@@ -38,7 +38,7 @@ package sonia.scm.web;
 import com.google.inject.servlet.ServletModule;
 
 import sonia.scm.installer.HgPackageReader;
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 import sonia.scm.repository.HgContext;
 import sonia.scm.repository.HgContextProvider;
 import sonia.scm.repository.HgHookManager;
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/DBFormatHealthCheck.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/DBFormatHealthCheck.java
index 1f90943e6f..92016b589d 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/DBFormatHealthCheck.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/DBFormatHealthCheck.java
@@ -47,7 +47,7 @@ import org.tmatesoft.svn.core.SVNURL;
 import org.tmatesoft.svn.core.io.SVNRepository;
 import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
 
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 
 //~--- JDK imports ------------------------------------------------------------
 
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
index 1625b8d01c..c950e1b32d 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
@@ -52,7 +52,7 @@ import org.tmatesoft.svn.util.SVNDebugLog;
 import sonia.scm.Type;
 import sonia.scm.io.FileSystem;
 import sonia.scm.logging.SVNKitLogger;
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 import sonia.scm.repository.spi.SvnRepositoryServiceProvider;
 import sonia.scm.store.StoreFactory;
 import sonia.scm.util.Util;
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceResolver.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceResolver.java
index cf01df8f84..c46c6722be 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceResolver.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceResolver.java
@@ -36,7 +36,7 @@ package sonia.scm.repository.spi;
 
 import com.google.inject.Inject;
 
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.SvnRepositoryHandler;
 
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnServletModule.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnServletModule.java
index 9eda6fe7dd..c7535ba9f0 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnServletModule.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnServletModule.java
@@ -37,7 +37,7 @@ package sonia.scm.web;
 
 import com.google.inject.servlet.ServletModule;
 
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 import sonia.scm.web.filter.BasicAuthenticationFilter;
 
 //~--- JDK imports ------------------------------------------------------------
diff --git a/scm-samples/scm-sample-auth/src/main/java/sonia/scm/sample/auth/SampleAuthenticationHandler.java b/scm-samples/scm-sample-auth/src/main/java/sonia/scm/sample/auth/SampleAuthenticationHandler.java
index b4cd3d71be..e87118417f 100644
--- a/scm-samples/scm-sample-auth/src/main/java/sonia/scm/sample/auth/SampleAuthenticationHandler.java
+++ b/scm-samples/scm-sample-auth/src/main/java/sonia/scm/sample/auth/SampleAuthenticationHandler.java
@@ -42,7 +42,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import sonia.scm.SCMContextProvider;
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 import sonia.scm.store.Store;
 import sonia.scm.store.StoreFactory;
 import sonia.scm.user.User;
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/HealthCheckContextListener.java b/scm-webapp/src/main/java/sonia/scm/repository/HealthCheckContextListener.java
index 545871b508..a0918c3e64 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/HealthCheckContextListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/HealthCheckContextListener.java
@@ -37,7 +37,7 @@ import com.google.inject.Inject;
 
 import org.apache.shiro.SecurityUtils;
 
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 import sonia.scm.web.security.AdministrationContext;
 import sonia.scm.web.security.PrivilegedAction;
 
diff --git a/scm-webapp/src/main/java/sonia/scm/web/security/DefaultAuthenticationHandler.java b/scm-webapp/src/main/java/sonia/scm/web/security/DefaultAuthenticationHandler.java
index 66293ebcde..466de681ec 100644
--- a/scm-webapp/src/main/java/sonia/scm/web/security/DefaultAuthenticationHandler.java
+++ b/scm-webapp/src/main/java/sonia/scm/web/security/DefaultAuthenticationHandler.java
@@ -52,7 +52,7 @@ import java.io.IOException;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import sonia.scm.plugin.ext.Extension;
+import sonia.scm.plugin.Extension;
 
 /**
  *