diff --git a/src/components/PerformCredentialRequest.vue b/src/components/PerformCredentialRequest.vue
index 970bc71..6d95a13 100644
--- a/src/components/PerformCredentialRequest.vue
+++ b/src/components/PerformCredentialRequest.vue
@@ -29,15 +29,15 @@ import axios from "axios";
 
 import { CONNECTORS } from "../constants";
 import ConnectorImage from "./ConnectorImage.vue";
-import JolocomIssue from "./JolocomIssue.vue";
-import JolocomVerify from "./JolocomVerify.vue";
-import IrmaVerify from "./IrmaVerify.vue";
-import IndyIssue from "./IndyIssue.vue";
-import IndyVerify from "./IndyVerify.vue";
-import IdaIssue from "./IdaIssue.vue";
-import IdaVerify from "./IdaVerify.vue";
-import TrinsicIssue from "./TrinsicIssue.vue";
-import TrinsicVerify from "./TrinsicVerify.vue";
+import JolocomIssue from "./connectors/jolocom/JolocomIssue.vue";
+import JolocomVerify from "./connectors/jolocom/JolocomVerify.vue";
+import IrmaVerify from "./connectors/irma/IrmaVerify.vue";
+import IndyIssue from "./connectors/indy/IndyIssue.vue";
+import IndyVerify from "./connectors/indy/IndyVerify.vue";
+import IdaIssue from "./connectors/ida/IdaIssue.vue";
+import IdaVerify from "./connectors/ida/IdaVerify.vue";
+import TrinsicIssue from "./connectors/trinsic/TrinsicIssue.vue";
+import TrinsicVerify from "./connectors/trinsic/TrinsicVerify.vue";
 
 const componentMap = {
   jolocom: {
diff --git a/src/components/IdaIssue.vue b/src/components/connectors/ida/IdaIssue.vue
similarity index 100%
rename from src/components/IdaIssue.vue
rename to src/components/connectors/ida/IdaIssue.vue
diff --git a/src/components/IdaVerify.vue b/src/components/connectors/ida/IdaVerify.vue
similarity index 100%
rename from src/components/IdaVerify.vue
rename to src/components/connectors/ida/IdaVerify.vue
diff --git a/src/components/IndyConnectionModal.vue b/src/components/connectors/indy/IndyConnectionModal.vue
similarity index 100%
rename from src/components/IndyConnectionModal.vue
rename to src/components/connectors/indy/IndyConnectionModal.vue
diff --git a/src/components/IndyIssue.vue b/src/components/connectors/indy/IndyIssue.vue
similarity index 100%
rename from src/components/IndyIssue.vue
rename to src/components/connectors/indy/IndyIssue.vue
diff --git a/src/components/IndyVerify.vue b/src/components/connectors/indy/IndyVerify.vue
similarity index 100%
rename from src/components/IndyVerify.vue
rename to src/components/connectors/indy/IndyVerify.vue
diff --git a/src/components/IrmaSession.vue b/src/components/connectors/irma/IrmaSession.vue
similarity index 100%
rename from src/components/IrmaSession.vue
rename to src/components/connectors/irma/IrmaSession.vue
diff --git a/src/components/IrmaVerify.vue b/src/components/connectors/irma/IrmaVerify.vue
similarity index 100%
rename from src/components/IrmaVerify.vue
rename to src/components/connectors/irma/IrmaVerify.vue
diff --git a/src/components/JolocomIssue.vue b/src/components/connectors/jolocom/JolocomIssue.vue
similarity index 100%
rename from src/components/JolocomIssue.vue
rename to src/components/connectors/jolocom/JolocomIssue.vue
diff --git a/src/components/JolocomVerify.vue b/src/components/connectors/jolocom/JolocomVerify.vue
similarity index 100%
rename from src/components/JolocomVerify.vue
rename to src/components/connectors/jolocom/JolocomVerify.vue
diff --git a/src/components/TrinsicConnectionModal.vue b/src/components/connectors/trinsic/TrinsicConnectionModal.vue
similarity index 100%
rename from src/components/TrinsicConnectionModal.vue
rename to src/components/connectors/trinsic/TrinsicConnectionModal.vue
diff --git a/src/components/TrinsicIssue.vue b/src/components/connectors/trinsic/TrinsicIssue.vue
similarity index 100%
rename from src/components/TrinsicIssue.vue
rename to src/components/connectors/trinsic/TrinsicIssue.vue
diff --git a/src/components/TrinsicVerify.vue b/src/components/connectors/trinsic/TrinsicVerify.vue
similarity index 100%
rename from src/components/TrinsicVerify.vue
rename to src/components/connectors/trinsic/TrinsicVerify.vue
diff --git a/src/views/CreateIssueRequest.vue b/src/views/CreateIssueRequest.vue
index 7b6991c..63d0673 100644
--- a/src/views/CreateIssueRequest.vue
+++ b/src/views/CreateIssueRequest.vue
@@ -1,10 +1,6 @@
 <template>
   <div class="issue">
-    <create-credential-request
-      :token="token"
-      type="issue"
-      @choice="handleChoice"
-    >
+    <create-credential-request :token="token" type="issue" @choice="handleChoice">
       <div class="py-5 text-center">
         <h2>Select your Wallet app</h2>
         <p>