diff --git a/broker/src/main/java/io/moquette/server/DefaultMoquetteSslContextCreator.java b/broker/src/main/java/io/moquette/server/DefaultMoquetteSslContextCreator.java
index 15e07424..97e790ea 100644
--- a/broker/src/main/java/io/moquette/server/DefaultMoquetteSslContextCreator.java
+++ b/broker/src/main/java/io/moquette/server/DefaultMoquetteSslContextCreator.java
@@ -17,6 +17,7 @@ package io.moquette.server;
 
 import io.moquette.BrokerConstants;
 import io.moquette.server.config.IConfig;
+import io.moquette.spi.security.ISslContextCreator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/broker/src/main/java/io/moquette/server/Server.java b/broker/src/main/java/io/moquette/server/Server.java
index e055a5c4..031a3f90 100644
--- a/broker/src/main/java/io/moquette/server/Server.java
+++ b/broker/src/main/java/io/moquette/server/Server.java
@@ -24,6 +24,7 @@ import io.moquette.server.config.FilesystemConfig;
 import io.moquette.server.config.IConfig;
 import io.moquette.server.netty.NettyAcceptor;
 import io.moquette.spi.impl.ProtocolProcessor;
+import io.moquette.spi.security.ISslContextCreator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/broker/src/main/java/io/moquette/server/ServerAcceptor.java b/broker/src/main/java/io/moquette/server/ServerAcceptor.java
index b21bf638..54aa507e 100644
--- a/broker/src/main/java/io/moquette/server/ServerAcceptor.java
+++ b/broker/src/main/java/io/moquette/server/ServerAcceptor.java
@@ -19,6 +19,7 @@ import java.io.IOException;
 
 import io.moquette.server.config.IConfig;
 import io.moquette.spi.impl.ProtocolProcessor;
+import io.moquette.spi.security.ISslContextCreator;
 
 /**
  *
diff --git a/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java
index a7d015b0..97b1b016 100644
--- a/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java
+++ b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java
@@ -19,8 +19,7 @@ import io.moquette.BrokerConstants;
 import io.moquette.commons.Constants;
 import io.moquette.parser.netty.MQTTDecoder;
 import io.moquette.parser.netty.MQTTEncoder;
-import io.moquette.server.DefaultMoquetteSslContextCreator;
-import io.moquette.server.ISslContextCreator;
+import io.moquette.spi.security.ISslContextCreator;
 import io.moquette.server.ServerAcceptor;
 import io.moquette.server.config.IConfig;
 import io.moquette.server.netty.metrics.*;
diff --git a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
index f301ea94..28eeb93f 100644
--- a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
+++ b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
@@ -26,8 +26,8 @@ import io.moquette.spi.ClientSession;
 import io.moquette.spi.IMatchingCondition;
 import io.moquette.spi.IMessagesStore;
 import io.moquette.spi.ISessionsStore;
-import io.moquette.spi.impl.security.IAuthenticator;
-import io.moquette.spi.impl.security.IAuthorizator;
+import io.moquette.spi.security.IAuthenticator;
+import io.moquette.spi.security.IAuthorizator;
 import io.moquette.spi.impl.subscriptions.SubscriptionsStore;
 import io.moquette.spi.impl.subscriptions.Subscription;
 
diff --git a/broker/src/main/java/io/moquette/spi/impl/SimpleMessaging.java b/broker/src/main/java/io/moquette/spi/impl/SimpleMessaging.java
index 8e71eeb9..da1f624f 100644
--- a/broker/src/main/java/io/moquette/spi/impl/SimpleMessaging.java
+++ b/broker/src/main/java/io/moquette/spi/impl/SimpleMessaging.java
@@ -23,6 +23,8 @@ import io.moquette.spi.ISessionsStore;
 import io.moquette.spi.impl.security.*;
 import io.moquette.spi.impl.subscriptions.SubscriptionsStore;
 import io.moquette.spi.persistence.MapDBPersistentStore;
+import io.moquette.spi.security.IAuthenticator;
+import io.moquette.spi.security.IAuthorizator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/broker/src/main/java/io/moquette/spi/impl/security/AcceptAllAuthenticator.java b/broker/src/main/java/io/moquette/spi/impl/security/AcceptAllAuthenticator.java
index ff216fce..0e39dd6d 100644
--- a/broker/src/main/java/io/moquette/spi/impl/security/AcceptAllAuthenticator.java
+++ b/broker/src/main/java/io/moquette/spi/impl/security/AcceptAllAuthenticator.java
@@ -1,5 +1,7 @@
 package io.moquette.spi.impl.security;
 
+import io.moquette.spi.security.IAuthenticator;
+
 /**
  * Created by andrea on 8/23/14.
  */
diff --git a/broker/src/main/java/io/moquette/spi/impl/security/AuthorizationsCollector.java b/broker/src/main/java/io/moquette/spi/impl/security/AuthorizationsCollector.java
index 50ff998d..2254bbfb 100644
--- a/broker/src/main/java/io/moquette/spi/impl/security/AuthorizationsCollector.java
+++ b/broker/src/main/java/io/moquette/spi/impl/security/AuthorizationsCollector.java
@@ -16,6 +16,7 @@
 package io.moquette.spi.impl.security;
 
 import io.moquette.spi.impl.subscriptions.SubscriptionsStore;
+import io.moquette.spi.security.IAuthorizator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/broker/src/main/java/io/moquette/spi/impl/security/DenyAllAuthorizator.java b/broker/src/main/java/io/moquette/spi/impl/security/DenyAllAuthorizator.java
index 031199a1..17b35f30 100644
--- a/broker/src/main/java/io/moquette/spi/impl/security/DenyAllAuthorizator.java
+++ b/broker/src/main/java/io/moquette/spi/impl/security/DenyAllAuthorizator.java
@@ -15,6 +15,8 @@
  */
 package io.moquette.spi.impl.security;
 
+import io.moquette.spi.security.IAuthorizator;
+
 /**
  * @author andrea
  */
diff --git a/broker/src/main/java/io/moquette/spi/impl/security/FileAuthenticator.java b/broker/src/main/java/io/moquette/spi/impl/security/FileAuthenticator.java
index c3b719a9..e2423417 100644
--- a/broker/src/main/java/io/moquette/spi/impl/security/FileAuthenticator.java
+++ b/broker/src/main/java/io/moquette/spi/impl/security/FileAuthenticator.java
@@ -15,6 +15,7 @@
  */
 package io.moquette.spi.impl.security;
 
+import io.moquette.spi.security.IAuthenticator;
 import org.apache.commons.codec.binary.Hex;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/broker/src/main/java/io/moquette/spi/impl/security/PermitAllAuthorizator.java b/broker/src/main/java/io/moquette/spi/impl/security/PermitAllAuthorizator.java
index 07e856dd..28e44a6e 100644
--- a/broker/src/main/java/io/moquette/spi/impl/security/PermitAllAuthorizator.java
+++ b/broker/src/main/java/io/moquette/spi/impl/security/PermitAllAuthorizator.java
@@ -15,6 +15,8 @@
  */
 package io.moquette.spi.impl.security;
 
+import io.moquette.spi.security.IAuthorizator;
+
 /**
  * @author andrea
  */
diff --git a/broker/src/main/java/io/moquette/spi/impl/security/IAuthenticator.java b/broker/src/main/java/io/moquette/spi/security/IAuthenticator.java
similarity index 95%
rename from broker/src/main/java/io/moquette/spi/impl/security/IAuthenticator.java
rename to broker/src/main/java/io/moquette/spi/security/IAuthenticator.java
index e1121086..e760a3d2 100644
--- a/broker/src/main/java/io/moquette/spi/impl/security/IAuthenticator.java
+++ b/broker/src/main/java/io/moquette/spi/security/IAuthenticator.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.spi.impl.security;
+package io.moquette.spi.security;
 
 /**
  * username and password checker
diff --git a/broker/src/main/java/io/moquette/spi/impl/security/IAuthorizator.java b/broker/src/main/java/io/moquette/spi/security/IAuthorizator.java
similarity index 96%
rename from broker/src/main/java/io/moquette/spi/impl/security/IAuthorizator.java
rename to broker/src/main/java/io/moquette/spi/security/IAuthorizator.java
index 5245516b..5d53c0cd 100644
--- a/broker/src/main/java/io/moquette/spi/impl/security/IAuthorizator.java
+++ b/broker/src/main/java/io/moquette/spi/security/IAuthorizator.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.spi.impl.security;
+package io.moquette.spi.security;
 
 /**
  * ACL checker.
diff --git a/broker/src/main/java/io/moquette/server/ISslContextCreator.java b/broker/src/main/java/io/moquette/spi/security/ISslContextCreator.java
similarity index 96%
rename from broker/src/main/java/io/moquette/server/ISslContextCreator.java
rename to broker/src/main/java/io/moquette/spi/security/ISslContextCreator.java
index 6b40b03b..4063eaba 100644
--- a/broker/src/main/java/io/moquette/server/ISslContextCreator.java
+++ b/broker/src/main/java/io/moquette/spi/security/ISslContextCreator.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.server;
+package io.moquette.spi.security;
 
 import javax.net.ssl.SSLContext;
 
diff --git a/broker/src/test/java/io/moquette/server/ConfigurationClassLoaderTest.java b/broker/src/test/java/io/moquette/server/ConfigurationClassLoaderTest.java
index 1344b004..b91735cd 100644
--- a/broker/src/test/java/io/moquette/server/ConfigurationClassLoaderTest.java
+++ b/broker/src/test/java/io/moquette/server/ConfigurationClassLoaderTest.java
@@ -18,8 +18,8 @@ package io.moquette.server;
 import io.moquette.BrokerConstants;
 import io.moquette.server.config.IConfig;
 import io.moquette.server.config.MemoryConfig;
-import io.moquette.spi.impl.security.IAuthenticator;
-import io.moquette.spi.impl.security.IAuthorizator;
+import io.moquette.spi.security.IAuthenticator;
+import io.moquette.spi.security.IAuthorizator;
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/broker/src/test/java/io/moquette/spi/impl/MockAuthenticator.java b/broker/src/test/java/io/moquette/spi/impl/MockAuthenticator.java
index a2ac5ca5..892b835e 100644
--- a/broker/src/test/java/io/moquette/spi/impl/MockAuthenticator.java
+++ b/broker/src/test/java/io/moquette/spi/impl/MockAuthenticator.java
@@ -17,7 +17,7 @@ package io.moquette.spi.impl;
 
 import java.util.Map;
 
-import io.moquette.spi.impl.security.IAuthenticator;
+import io.moquette.spi.security.IAuthenticator;
 
 /**
  * Test utility to implements authenticator instance.
diff --git a/broker/src/test/java/io/moquette/spi/impl/security/FileAuthenticatorTest.java b/broker/src/test/java/io/moquette/spi/impl/security/FileAuthenticatorTest.java
index 7fe156c9..f18e2673 100644
--- a/broker/src/test/java/io/moquette/spi/impl/security/FileAuthenticatorTest.java
+++ b/broker/src/test/java/io/moquette/spi/impl/security/FileAuthenticatorTest.java
@@ -15,6 +15,7 @@
  */
 package io.moquette.spi.impl.security;
 
+import io.moquette.spi.security.IAuthenticator;
 import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;