diff --git a/src/components/login/Login.js b/src/components/structures/login/Login.js
similarity index 99%
rename from src/components/login/Login.js
rename to src/components/structures/login/Login.js
index 394fa0ccd..3503fdba9 100644
--- a/src/components/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -22,7 +22,7 @@ var sdk = require('matrix-react-sdk');
 var Signup = require("matrix-react-sdk/lib/Signup");
 var PasswordLogin = require("matrix-react-sdk/lib/components/views/login/PasswordLogin");
 var CasLogin = require("matrix-react-sdk/lib/components/views/login/CasLogin");
-var ServerConfig = require("./ServerConfig");
+var ServerConfig = require("../../views/login/ServerConfig");
 
 /**
  * A wire component which glues together login UI components and Signup logic
diff --git a/src/components/login/PostRegistration.js b/src/components/structures/login/PostRegistration.js
similarity index 100%
rename from src/components/login/PostRegistration.js
rename to src/components/structures/login/PostRegistration.js
diff --git a/src/components/login/Registration.js b/src/components/structures/login/Registration.js
similarity index 98%
rename from src/components/login/Registration.js
rename to src/components/structures/login/Registration.js
index e8d3cbb65..7137582ce 100644
--- a/src/components/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -21,8 +21,8 @@ var React = require('react');
 var sdk = require('matrix-react-sdk');
 var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var dis = require('matrix-react-sdk/lib/dispatcher');
-var ServerConfig = require("./ServerConfig");
-var RegistrationForm = require("./RegistrationForm");
+var ServerConfig = require("../../views/login/ServerConfig");
+var RegistrationForm = require("../../views/login/RegistrationForm");
 var CaptchaForm = require("matrix-react-sdk/lib/components/views/login/CaptchaForm");
 var Signup = require("matrix-react-sdk/lib/Signup");
 var MIN_PASSWORD_LENGTH = 6;
diff --git a/src/components/login/RegistrationForm.js b/src/components/views/login/RegistrationForm.js
similarity index 100%
rename from src/components/login/RegistrationForm.js
rename to src/components/views/login/RegistrationForm.js
diff --git a/src/components/login/ServerConfig.js b/src/components/views/login/ServerConfig.js
similarity index 100%
rename from src/components/login/ServerConfig.js
rename to src/components/views/login/ServerConfig.js
diff --git a/src/skins/vector/views/pages/MatrixChat.js b/src/skins/vector/views/pages/MatrixChat.js
index 2783a77f7..714c637b4 100644
--- a/src/skins/vector/views/pages/MatrixChat.js
+++ b/src/skins/vector/views/pages/MatrixChat.js
@@ -25,9 +25,9 @@ var dis = require('matrix-react-sdk/lib/dispatcher');
 var Matrix = require("matrix-js-sdk");
 
 var ContextualMenu = require("../../../../ContextualMenu");
-var Login = require("../../../../components/login/Login");
-var Registration = require("../../../../components/login/Registration");
-var PostRegistration = require("../../../../components/login/PostRegistration");
+var Login = require("../../../../components/structures/login/Login");
+var Registration = require("../../../../components/structures/login/Registration");
+var PostRegistration = require("../../../../components/structures/login/PostRegistration");
 var config = require("../../../../../config.json");
 
 module.exports = React.createClass({