diff --git a/src/main/java/io/kamax/mxisd/controller/v1/AuthController.java b/src/main/java/io/kamax/mxisd/controller/auth/v1/AuthController.java
similarity index 96%
rename from src/main/java/io/kamax/mxisd/controller/v1/AuthController.java
rename to src/main/java/io/kamax/mxisd/controller/auth/v1/AuthController.java
index ae10c93..5e86cec 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/AuthController.java
+++ b/src/main/java/io/kamax/mxisd/controller/auth/v1/AuthController.java
@@ -18,14 +18,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1;
+package io.kamax.mxisd.controller.auth.v1;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import io.kamax.mxisd.auth.AuthManager;
 import io.kamax.mxisd.auth.UserAuthResult;
-import io.kamax.mxisd.controller.v1.io.CredentialsValidationResponse;
+import io.kamax.mxisd.controller.auth.v1.io.CredentialsValidationResponse;
 import io.kamax.mxisd.exception.JsonMemberNotFoundException;
 import io.kamax.mxisd.util.GsonParser;
 import io.kamax.mxisd.util.GsonUtil;
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/io/CredentialsValidationResponse.java b/src/main/java/io/kamax/mxisd/controller/auth/v1/io/CredentialsValidationResponse.java
similarity index 97%
rename from src/main/java/io/kamax/mxisd/controller/v1/io/CredentialsValidationResponse.java
rename to src/main/java/io/kamax/mxisd/controller/auth/v1/io/CredentialsValidationResponse.java
index cd8517a..5e3fccb 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/io/CredentialsValidationResponse.java
+++ b/src/main/java/io/kamax/mxisd/controller/auth/v1/io/CredentialsValidationResponse.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1.io;
+package io.kamax.mxisd.controller.auth.v1.io;
 
 import io.kamax.mxisd.ThreePid;
 
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/ClientBulkLookupAnswer.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/ClientBulkLookupAnswer.java
similarity index 96%
rename from src/main/java/io/kamax/mxisd/controller/v1/ClientBulkLookupAnswer.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/ClientBulkLookupAnswer.java
index 1f0dc34..83cbcd5 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/ClientBulkLookupAnswer.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/ClientBulkLookupAnswer.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1;
+package io.kamax.mxisd.controller.identity.v1;
 
 import io.kamax.mxisd.lookup.ThreePidMapping;
 
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/ClientBulkLookupRequest.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/ClientBulkLookupRequest.java
similarity index 96%
rename from src/main/java/io/kamax/mxisd/controller/v1/ClientBulkLookupRequest.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/ClientBulkLookupRequest.java
index eb7ab73..9a57f1e 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/ClientBulkLookupRequest.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/ClientBulkLookupRequest.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1;
+package io.kamax.mxisd.controller.identity.v1;
 
 import io.kamax.mxisd.lookup.ThreePidMapping;
 
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/DefaultExceptionHandler.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/DefaultExceptionHandler.java
similarity index 98%
rename from src/main/java/io/kamax/mxisd/controller/v1/DefaultExceptionHandler.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/DefaultExceptionHandler.java
index c606a0e..237dd86 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/DefaultExceptionHandler.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/DefaultExceptionHandler.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1;
+package io.kamax.mxisd.controller.identity.v1;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/IdentityAPIv1.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/IdentityAPIv1.java
similarity index 96%
rename from src/main/java/io/kamax/mxisd/controller/v1/IdentityAPIv1.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/IdentityAPIv1.java
index a069ff8..d209d48 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/IdentityAPIv1.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/IdentityAPIv1.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1;
+package io.kamax.mxisd.controller.identity.v1;
 
 public class IdentityAPIv1 {
 
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/InvitationController.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/InvitationController.java
similarity index 96%
rename from src/main/java/io/kamax/mxisd/controller/v1/InvitationController.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/InvitationController.java
index fe8541d..697f805 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/InvitationController.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/InvitationController.java
@@ -18,12 +18,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1;
+package io.kamax.mxisd.controller.identity.v1;
 
 import com.google.gson.Gson;
 import io.kamax.matrix.MatrixID;
 import io.kamax.mxisd.config.ServerConfig;
-import io.kamax.mxisd.controller.v1.io.ThreePidInviteReplyIO;
+import io.kamax.mxisd.controller.identity.v1.io.ThreePidInviteReplyIO;
 import io.kamax.mxisd.invitation.IThreePidInvite;
 import io.kamax.mxisd.invitation.IThreePidInviteReply;
 import io.kamax.mxisd.invitation.InvitationManager;
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/KeyController.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/KeyController.java
similarity index 96%
rename from src/main/java/io/kamax/mxisd/controller/v1/KeyController.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/KeyController.java
index bac51af..cd6575f 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/KeyController.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/KeyController.java
@@ -18,11 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1;
+package io.kamax.mxisd.controller.identity.v1;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import io.kamax.mxisd.controller.v1.io.KeyValidityJson;
+import io.kamax.mxisd.controller.identity.v1.io.KeyValidityJson;
 import io.kamax.mxisd.exception.BadRequestException;
 import io.kamax.mxisd.key.KeyManager;
 import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/MappingController.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/MappingController.java
similarity index 97%
rename from src/main/java/io/kamax/mxisd/controller/v1/MappingController.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/MappingController.java
index c665729..07497ef 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/MappingController.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/MappingController.java
@@ -18,11 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1;
+package io.kamax.mxisd.controller.identity.v1;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import io.kamax.mxisd.controller.v1.io.SingeLookupReplyJson;
+import io.kamax.mxisd.controller.identity.v1.io.SingeLookupReplyJson;
 import io.kamax.mxisd.exception.InternalServerError;
 import io.kamax.mxisd.lookup.*;
 import io.kamax.mxisd.lookup.strategy.LookupStrategy;
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/SessionController.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/SessionController.java
similarity index 96%
rename from src/main/java/io/kamax/mxisd/controller/v1/SessionController.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/SessionController.java
index 319f441..46e8413 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/SessionController.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/SessionController.java
@@ -18,11 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1;
+package io.kamax.mxisd.controller.identity.v1;
 
 import io.kamax.mxisd.config.ServerConfig;
 import io.kamax.mxisd.config.ViewConfig;
-import io.kamax.mxisd.controller.v1.remote.RemoteIdentityAPIv1;
+import io.kamax.mxisd.controller.identity.v1.remote.RemoteIdentityAPIv1;
 import io.kamax.mxisd.exception.InternalServerError;
 import io.kamax.mxisd.session.SessionMananger;
 import io.kamax.mxisd.session.ValidationResult;
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/SessionRestController.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/SessionRestController.java
similarity index 96%
rename from src/main/java/io/kamax/mxisd/controller/v1/SessionRestController.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/SessionRestController.java
index 163dc88..9332d04 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/SessionRestController.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/SessionRestController.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1;
+package io.kamax.mxisd.controller.identity.v1;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -26,9 +26,9 @@ import io.kamax.matrix.ThreePidMedium;
 import io.kamax.mxisd.ThreePid;
 import io.kamax.mxisd.config.ServerConfig;
 import io.kamax.mxisd.config.ViewConfig;
-import io.kamax.mxisd.controller.v1.io.SessionEmailTokenRequestJson;
-import io.kamax.mxisd.controller.v1.io.SessionPhoneTokenRequestJson;
-import io.kamax.mxisd.controller.v1.io.SuccessStatusJson;
+import io.kamax.mxisd.controller.identity.v1.io.SessionEmailTokenRequestJson;
+import io.kamax.mxisd.controller.identity.v1.io.SessionPhoneTokenRequestJson;
+import io.kamax.mxisd.controller.identity.v1.io.SuccessStatusJson;
 import io.kamax.mxisd.exception.BadRequestException;
 import io.kamax.mxisd.exception.SessionNotValidatedException;
 import io.kamax.mxisd.invitation.InvitationManager;
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/StatusController.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/StatusController.java
similarity index 97%
rename from src/main/java/io/kamax/mxisd/controller/v1/StatusController.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/StatusController.java
index 6dda07e..186a718 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/StatusController.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/StatusController.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1;
+package io.kamax.mxisd.controller.identity.v1;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/io/GenericTokenRequestJson.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/GenericTokenRequestJson.java
similarity index 95%
rename from src/main/java/io/kamax/mxisd/controller/v1/io/GenericTokenRequestJson.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/io/GenericTokenRequestJson.java
index 0812505..857081f 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/io/GenericTokenRequestJson.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/GenericTokenRequestJson.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1.io;
+package io.kamax.mxisd.controller.identity.v1.io;
 
 public abstract class GenericTokenRequestJson {
 
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/io/KeyValidityJson.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/KeyValidityJson.java
similarity index 95%
rename from src/main/java/io/kamax/mxisd/controller/v1/io/KeyValidityJson.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/io/KeyValidityJson.java
index 9f914d0..53e7299 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/io/KeyValidityJson.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/KeyValidityJson.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1.io;
+package io.kamax.mxisd.controller.identity.v1.io;
 
 public class KeyValidityJson {
 
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/io/RequestTokenResponse.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/RequestTokenResponse.java
similarity index 94%
rename from src/main/java/io/kamax/mxisd/controller/v1/io/RequestTokenResponse.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/io/RequestTokenResponse.java
index 1946cd0..ad621b8 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/io/RequestTokenResponse.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/RequestTokenResponse.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1.io;
+package io.kamax.mxisd.controller.identity.v1.io;
 
 public class RequestTokenResponse {
 
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/io/SessionEmailTokenRequestJson.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/SessionEmailTokenRequestJson.java
similarity index 95%
rename from src/main/java/io/kamax/mxisd/controller/v1/io/SessionEmailTokenRequestJson.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/io/SessionEmailTokenRequestJson.java
index 84de8f4..49b1f76 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/io/SessionEmailTokenRequestJson.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/SessionEmailTokenRequestJson.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1.io;
+package io.kamax.mxisd.controller.identity.v1.io;
 
 public class SessionEmailTokenRequestJson extends GenericTokenRequestJson {
 
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/io/SessionPhoneTokenRequestJson.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/SessionPhoneTokenRequestJson.java
similarity index 96%
rename from src/main/java/io/kamax/mxisd/controller/v1/io/SessionPhoneTokenRequestJson.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/io/SessionPhoneTokenRequestJson.java
index e2e82c2..f030e06 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/io/SessionPhoneTokenRequestJson.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/SessionPhoneTokenRequestJson.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1.io;
+package io.kamax.mxisd.controller.identity.v1.io;
 
 import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/io/SingeLookupReplyJson.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/SingeLookupReplyJson.java
similarity index 97%
rename from src/main/java/io/kamax/mxisd/controller/v1/io/SingeLookupReplyJson.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/io/SingeLookupReplyJson.java
index 5627664..d06528a 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/io/SingeLookupReplyJson.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/SingeLookupReplyJson.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1.io;
+package io.kamax.mxisd.controller.identity.v1.io;
 
 import io.kamax.mxisd.lookup.SingleLookupReply;
 
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/io/SuccessStatusJson.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/SuccessStatusJson.java
similarity index 95%
rename from src/main/java/io/kamax/mxisd/controller/v1/io/SuccessStatusJson.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/io/SuccessStatusJson.java
index e7f43b1..c1e79f7 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/io/SuccessStatusJson.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/SuccessStatusJson.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1.io;
+package io.kamax.mxisd.controller.identity.v1.io;
 
 public class SuccessStatusJson {
 
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/io/ThreePidInviteReplyIO.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/ThreePidInviteReplyIO.java
similarity index 97%
rename from src/main/java/io/kamax/mxisd/controller/v1/io/ThreePidInviteReplyIO.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/io/ThreePidInviteReplyIO.java
index 7e88e2d..c05a713 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/io/ThreePidInviteReplyIO.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/ThreePidInviteReplyIO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1.io;
+package io.kamax.mxisd.controller.identity.v1.io;
 
 import io.kamax.mxisd.invitation.IThreePidInviteReply;
 
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/remote/RemoteIdentityAPIv1.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/remote/RemoteIdentityAPIv1.java
similarity index 96%
rename from src/main/java/io/kamax/mxisd/controller/v1/remote/RemoteIdentityAPIv1.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/remote/RemoteIdentityAPIv1.java
index 11d5192..6cc9271 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/remote/RemoteIdentityAPIv1.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/remote/RemoteIdentityAPIv1.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller.v1.remote;
+package io.kamax.mxisd.controller.identity.v1.remote;
 
 public class RemoteIdentityAPIv1 {
 
diff --git a/src/main/java/io/kamax/mxisd/controller/v1/remote/RemoteSessionController.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/remote/RemoteSessionController.java
similarity index 88%
rename from src/main/java/io/kamax/mxisd/controller/v1/remote/RemoteSessionController.java
rename to src/main/java/io/kamax/mxisd/controller/identity/v1/remote/RemoteSessionController.java
index 25c7517..4c17c59 100644
--- a/src/main/java/io/kamax/mxisd/controller/v1/remote/RemoteSessionController.java
+++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/remote/RemoteSessionController.java
@@ -1,4 +1,4 @@
-package io.kamax.mxisd.controller.v1.remote;
+package io.kamax.mxisd.controller.identity.v1.remote;
 
 import io.kamax.mxisd.config.ViewConfig;
 import io.kamax.mxisd.exception.SessionNotValidatedException;
@@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
 
-import static io.kamax.mxisd.controller.v1.remote.RemoteIdentityAPIv1.SESSION_CHECK;
-import static io.kamax.mxisd.controller.v1.remote.RemoteIdentityAPIv1.SESSION_REQUEST_TOKEN;
+import static io.kamax.mxisd.controller.identity.v1.remote.RemoteIdentityAPIv1.SESSION_CHECK;
+import static io.kamax.mxisd.controller.identity.v1.remote.RemoteIdentityAPIv1.SESSION_REQUEST_TOKEN;
 
 @Controller
 public class RemoteSessionController {
diff --git a/src/main/java/io/kamax/mxisd/lookup/SingleLookupReply.java b/src/main/java/io/kamax/mxisd/lookup/SingleLookupReply.java
index d3a212c..710c236 100644
--- a/src/main/java/io/kamax/mxisd/lookup/SingleLookupReply.java
+++ b/src/main/java/io/kamax/mxisd/lookup/SingleLookupReply.java
@@ -24,7 +24,7 @@ import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import io.kamax.matrix.MatrixID;
 import io.kamax.matrix._MatrixID;
-import io.kamax.mxisd.controller.v1.io.SingeLookupReplyJson;
+import io.kamax.mxisd.controller.identity.v1.io.SingeLookupReplyJson;
 
 import java.time.Instant;
 
diff --git a/src/main/java/io/kamax/mxisd/lookup/provider/RemoteIdentityServerFetcher.java b/src/main/java/io/kamax/mxisd/lookup/provider/RemoteIdentityServerFetcher.java
index bec8bd3..95e19c4 100644
--- a/src/main/java/io/kamax/mxisd/lookup/provider/RemoteIdentityServerFetcher.java
+++ b/src/main/java/io/kamax/mxisd/lookup/provider/RemoteIdentityServerFetcher.java
@@ -23,7 +23,7 @@ package io.kamax.mxisd.lookup.provider;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import io.kamax.mxisd.controller.v1.ClientBulkLookupRequest;
+import io.kamax.mxisd.controller.identity.v1.ClientBulkLookupRequest;
 import io.kamax.mxisd.exception.InvalidResponseJsonException;
 import io.kamax.mxisd.lookup.SingleLookupReply;
 import io.kamax.mxisd.lookup.SingleLookupRequest;
diff --git a/src/main/java/io/kamax/mxisd/session/SessionMananger.java b/src/main/java/io/kamax/mxisd/session/SessionMananger.java
index f50fa6d..5a49216 100644
--- a/src/main/java/io/kamax/mxisd/session/SessionMananger.java
+++ b/src/main/java/io/kamax/mxisd/session/SessionMananger.java
@@ -30,8 +30,8 @@ import io.kamax.matrix._MatrixID;
 import io.kamax.mxisd.ThreePid;
 import io.kamax.mxisd.config.MatrixConfig;
 import io.kamax.mxisd.config.SessionConfig;
-import io.kamax.mxisd.controller.v1.io.RequestTokenResponse;
-import io.kamax.mxisd.controller.v1.remote.RemoteIdentityAPIv1;
+import io.kamax.mxisd.controller.identity.v1.io.RequestTokenResponse;
+import io.kamax.mxisd.controller.identity.v1.remote.RemoteIdentityAPIv1;
 import io.kamax.mxisd.exception.*;
 import io.kamax.mxisd.lookup.ThreePidValidation;
 import io.kamax.mxisd.matrix.IdentityServerUtils;
diff --git a/src/main/java/io/kamax/mxisd/threepid/notification/PlaceholderNotificationGenerator.java b/src/main/java/io/kamax/mxisd/threepid/notification/PlaceholderNotificationGenerator.java
index 7a185b6..f457a1e 100644
--- a/src/main/java/io/kamax/mxisd/threepid/notification/PlaceholderNotificationGenerator.java
+++ b/src/main/java/io/kamax/mxisd/threepid/notification/PlaceholderNotificationGenerator.java
@@ -23,7 +23,7 @@ package io.kamax.mxisd.threepid.notification;
 import io.kamax.mxisd.ThreePid;
 import io.kamax.mxisd.config.MatrixConfig;
 import io.kamax.mxisd.config.ServerConfig;
-import io.kamax.mxisd.controller.v1.IdentityAPIv1;
+import io.kamax.mxisd.controller.identity.v1.IdentityAPIv1;
 import io.kamax.mxisd.invitation.IThreePidInviteReply;
 import io.kamax.mxisd.threepid.session.IThreePidSession;
 import org.apache.commons.lang.StringUtils;