diff --git a/src/main/java/io/kamax/mxisd/backend/ldap/LdapDirectoryProvider.java b/src/main/java/io/kamax/mxisd/backend/ldap/LdapDirectoryProvider.java
index 2c25b3f..f6f5254 100644
--- a/src/main/java/io/kamax/mxisd/backend/ldap/LdapDirectoryProvider.java
+++ b/src/main/java/io/kamax/mxisd/backend/ldap/LdapDirectoryProvider.java
@@ -23,7 +23,7 @@ package io.kamax.mxisd.backend.ldap;
 import io.kamax.mxisd.config.MatrixConfig;
 import io.kamax.mxisd.config.ldap.LdapAttributeConfig;
 import io.kamax.mxisd.config.ldap.LdapConfig;
-import io.kamax.mxisd.controller.directory.io.UserDirectorySearchResult;
+import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult;
 import io.kamax.mxisd.directory.IDirectoryProvider;
 import io.kamax.mxisd.exception.InternalServerError;
 import org.apache.directory.api.ldap.model.cursor.CursorException;
diff --git a/src/main/java/io/kamax/mxisd/backend/sql/SqlDirectoryProvider.java b/src/main/java/io/kamax/mxisd/backend/sql/SqlDirectoryProvider.java
index 3be7489..97a36f0 100644
--- a/src/main/java/io/kamax/mxisd/backend/sql/SqlDirectoryProvider.java
+++ b/src/main/java/io/kamax/mxisd/backend/sql/SqlDirectoryProvider.java
@@ -24,7 +24,7 @@ import io.kamax.matrix.MatrixID;
 import io.kamax.mxisd.config.MatrixConfig;
 import io.kamax.mxisd.config.sql.SqlConfig;
 import io.kamax.mxisd.config.sql.SqlProviderConfig;
-import io.kamax.mxisd.controller.directory.io.UserDirectorySearchResult;
+import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult;
 import io.kamax.mxisd.directory.IDirectoryProvider;
 import io.kamax.mxisd.exception.InternalServerError;
 import org.apache.commons.lang.StringUtils;
@@ -37,7 +37,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Optional;
 
-import static io.kamax.mxisd.controller.directory.io.UserDirectorySearchResult.Result;
+import static io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult.Result;
 
 public abstract class SqlDirectoryProvider implements IDirectoryProvider {
 
diff --git a/src/main/java/io/kamax/mxisd/controller/directory/UserDirectoryController.java b/src/main/java/io/kamax/mxisd/controller/directory/v1/UserDirectoryController.java
similarity index 90%
rename from src/main/java/io/kamax/mxisd/controller/directory/UserDirectoryController.java
rename to src/main/java/io/kamax/mxisd/controller/directory/v1/UserDirectoryController.java
index 78781f4..6af2a9f 100644
--- a/src/main/java/io/kamax/mxisd/controller/directory/UserDirectoryController.java
+++ b/src/main/java/io/kamax/mxisd/controller/directory/v1/UserDirectoryController.java
@@ -18,11 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.directory;
+package io.kamax.mxisd.controller.directory.v1;
 
 import com.google.gson.Gson;
-import io.kamax.mxisd.controller.directory.io.UserDirectorySearchRequest;
-import io.kamax.mxisd.controller.directory.io.UserDirectorySearchResult;
+import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchRequest;
+import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult;
 import io.kamax.mxisd.directory.DirectoryManager;
 import io.kamax.mxisd.util.GsonParser;
 import io.kamax.mxisd.util.GsonUtil;
diff --git a/src/main/java/io/kamax/mxisd/controller/directory/io/UserDirectorySearchRequest.java b/src/main/java/io/kamax/mxisd/controller/directory/v1/io/UserDirectorySearchRequest.java
similarity index 95%
rename from src/main/java/io/kamax/mxisd/controller/directory/io/UserDirectorySearchRequest.java
rename to src/main/java/io/kamax/mxisd/controller/directory/v1/io/UserDirectorySearchRequest.java
index 2f78d87..83e5639 100644
--- a/src/main/java/io/kamax/mxisd/controller/directory/io/UserDirectorySearchRequest.java
+++ b/src/main/java/io/kamax/mxisd/controller/directory/v1/io/UserDirectorySearchRequest.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.directory.io;
+package io.kamax.mxisd.controller.directory.v1.io;
 
 public class UserDirectorySearchRequest {
 
diff --git a/src/main/java/io/kamax/mxisd/controller/directory/io/UserDirectorySearchResult.java b/src/main/java/io/kamax/mxisd/controller/directory/v1/io/UserDirectorySearchResult.java
similarity index 97%
rename from src/main/java/io/kamax/mxisd/controller/directory/io/UserDirectorySearchResult.java
rename to src/main/java/io/kamax/mxisd/controller/directory/v1/io/UserDirectorySearchResult.java
index 128385c..5c63202 100644
--- a/src/main/java/io/kamax/mxisd/controller/directory/io/UserDirectorySearchResult.java
+++ b/src/main/java/io/kamax/mxisd/controller/directory/v1/io/UserDirectorySearchResult.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.directory.io;
+package io.kamax.mxisd.controller.directory.v1.io;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/io/kamax/mxisd/directory/DirectoryManager.java b/src/main/java/io/kamax/mxisd/directory/DirectoryManager.java
index bf0045e..eebd1ac 100644
--- a/src/main/java/io/kamax/mxisd/directory/DirectoryManager.java
+++ b/src/main/java/io/kamax/mxisd/directory/DirectoryManager.java
@@ -22,8 +22,8 @@ package io.kamax.mxisd.directory;
 
 import com.google.gson.Gson;
 import io.kamax.matrix.MatrixErrorInfo;
-import io.kamax.mxisd.controller.directory.io.UserDirectorySearchRequest;
-import io.kamax.mxisd.controller.directory.io.UserDirectorySearchResult;
+import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchRequest;
+import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult;
 import io.kamax.mxisd.dns.ClientDnsOverwrite;
 import io.kamax.mxisd.exception.InternalServerError;
 import io.kamax.mxisd.exception.MatrixException;
diff --git a/src/main/java/io/kamax/mxisd/directory/IDirectoryProvider.java b/src/main/java/io/kamax/mxisd/directory/IDirectoryProvider.java
index ddbf025..7f173f6 100644
--- a/src/main/java/io/kamax/mxisd/directory/IDirectoryProvider.java
+++ b/src/main/java/io/kamax/mxisd/directory/IDirectoryProvider.java
@@ -20,7 +20,7 @@
 
 package io.kamax.mxisd.directory;
 
-import io.kamax.mxisd.controller.directory.io.UserDirectorySearchResult;
+import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult;
 
 public interface IDirectoryProvider {