diff --git a/src/main/groovy/io/kamax/mxisd/controller/InvitationController.groovy b/src/main/groovy/io/kamax/mxisd/controller/v1/InvitationController.groovy
similarity index 97%
rename from src/main/groovy/io/kamax/mxisd/controller/InvitationController.groovy
rename to src/main/groovy/io/kamax/mxisd/controller/v1/InvitationController.groovy
index 63cbfb4..86b7e4b 100644
--- a/src/main/groovy/io/kamax/mxisd/controller/InvitationController.groovy
+++ b/src/main/groovy/io/kamax/mxisd/controller/v1/InvitationController.groovy
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller
+package io.kamax.mxisd.controller.v1
 
 import io.kamax.mxisd.exception.NotImplementedException
 import org.springframework.web.bind.annotation.RequestMapping
diff --git a/src/main/groovy/io/kamax/mxisd/controller/KeyController.groovy b/src/main/groovy/io/kamax/mxisd/controller/v1/KeyController.groovy
similarity index 98%
rename from src/main/groovy/io/kamax/mxisd/controller/KeyController.groovy
rename to src/main/groovy/io/kamax/mxisd/controller/v1/KeyController.groovy
index cad7aa6..0255438 100644
--- a/src/main/groovy/io/kamax/mxisd/controller/KeyController.groovy
+++ b/src/main/groovy/io/kamax/mxisd/controller/v1/KeyController.groovy
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller
+package io.kamax.mxisd.controller.v1
 
 import groovy.json.JsonOutput
 import io.kamax.mxisd.exception.BadRequestException
diff --git a/src/main/groovy/io/kamax/mxisd/controller/MappingController.groovy b/src/main/groovy/io/kamax/mxisd/controller/v1/MappingController.groovy
similarity index 98%
rename from src/main/groovy/io/kamax/mxisd/controller/MappingController.groovy
rename to src/main/groovy/io/kamax/mxisd/controller/v1/MappingController.groovy
index 4b8aa73..25f0bea 100644
--- a/src/main/groovy/io/kamax/mxisd/controller/MappingController.groovy
+++ b/src/main/groovy/io/kamax/mxisd/controller/v1/MappingController.groovy
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller
+package io.kamax.mxisd.controller.v1
 
 import groovy.json.JsonOutput
 import io.kamax.mxisd.config.LdapConfig
diff --git a/src/main/groovy/io/kamax/mxisd/controller/SessionController.groovy b/src/main/groovy/io/kamax/mxisd/controller/v1/SessionController.groovy
similarity index 98%
rename from src/main/groovy/io/kamax/mxisd/controller/SessionController.groovy
rename to src/main/groovy/io/kamax/mxisd/controller/v1/SessionController.groovy
index 2b22cae..9ff4f00 100644
--- a/src/main/groovy/io/kamax/mxisd/controller/SessionController.groovy
+++ b/src/main/groovy/io/kamax/mxisd/controller/v1/SessionController.groovy
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.controller
+package io.kamax.mxisd.controller.v1
 
 import io.kamax.mxisd.exception.NotImplementedException
 import org.springframework.web.bind.annotation.RequestMapping