Point things at the right places

src/components/login/Login.js

@@ -20,8 +20,8 @@ var React = require('react');
 var ReactDOM = require('react-dom');
 var sdk = require('matrix-react-sdk');
 var Signup = require("matrix-react-sdk/lib/Signup");
-var PasswordLogin = require("matrix-react-sdk/lib/components/login/PasswordLogin");
+var PasswordLogin = require("matrix-react-sdk/lib/components/views/login/PasswordLogin");
-var CasLogin = require("matrix-react-sdk/lib/components/login/CasLogin");
+var CasLogin = require("matrix-react-sdk/lib/components/views/login/CasLogin");
 var ServerConfig = require("./ServerConfig");
 
 /**

src/components/login/Registration.js

@@ -23,7 +23,7 @@ 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 CaptchaForm = require("matrix-react-sdk/lib/components/login/CaptchaForm");
+var CaptchaForm = require("matrix-react-sdk/lib/components/views/login/CaptchaForm");
 var Signup = require("matrix-react-sdk/lib/Signup");
 var MIN_PASSWORD_LENGTH = 6;
 

src/skins/vector/skindex.js

@@ -23,13 +23,15 @@ limitations under the License.
 
 var skin = {};
 
+// TODO: Fix this so matrix-react-sdk stuff is in react SDK.
+skin['avatars.RoomAvatar'] = require('matrix-react-sdk/lib/components/views/avatars/RoomAvatar');
+skin['avatars.MemberAvatar'] = require('matrix-react-sdk/lib/components/views/avatars/MemberAvatar');
+
 skin['atoms.EditableText'] = require('./views/atoms/EditableText');
 skin['atoms.EnableNotificationsButton'] = require('./views/atoms/EnableNotificationsButton');
 skin['atoms.ImageView'] = require('./views/atoms/ImageView');
 skin['atoms.LogoutButton'] = require('./views/atoms/LogoutButton');
-skin['atoms.MemberAvatar'] = require('./views/atoms/MemberAvatar');
 skin['atoms.MessageTimestamp'] = require('./views/atoms/MessageTimestamp');
-skin['atoms.RoomAvatar'] = require('./views/atoms/RoomAvatar');
 skin['atoms.Spinner'] = require('./views/atoms/Spinner');
 skin['atoms.create_room.CreateRoomButton'] = require('./views/atoms/create_room/CreateRoomButton');
 skin['atoms.create_room.Presets'] = require('./views/atoms/create_room/Presets');

src/skins/vector/views/molecules/EventTile.js

@@ -109,7 +109,7 @@ module.exports = React.createClass({
             return r2.data.ts - r1.data.ts;
         });
 
-        var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
+        var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
 
         var left = 0;
 
@@ -211,7 +211,7 @@ module.exports = React.createClass({
     render: function() {
         var MessageTimestamp = sdk.getComponent('atoms.MessageTimestamp');
         var SenderProfile = sdk.getComponent('molecules.SenderProfile');
-        var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
+        var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
 
         var content = this.props.mxEvent.getContent();
         var msgtype = content.msgtype;

src/skins/vector/views/molecules/MRoomMemberTile.js

@@ -34,7 +34,7 @@ module.exports = React.createClass({
         var text = this.getMemberEventText();
         if (!text) return <div/>;
         var MessageTimestamp = sdk.getComponent('atoms.MessageTimestamp');
-        var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
+        var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
         return (
             <div className="mx_MessageTile mx_MessageTile_notice">
                 <div className="mx_MessageTile_avatar">

src/skins/vector/views/molecules/MemberInfo.js

@@ -73,7 +73,7 @@ module.exports = React.createClass({
             </div>
         }
 
-        var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
+        var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
         return (
             <div className="mx_MemberInfo">
                 <img className="mx_MemberInfo_cancel" src="img/cancel-black.png" width="18" height="18" onClick={this.onCancel}/>

src/skins/vector/views/molecules/MemberTile.js

@@ -166,7 +166,7 @@ module.exports = React.createClass({
                 </div>
         }
 
-        var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
+        var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
         return (
             <div className={mainClassName} title={ this.getPowerLabel() } onClick={ this.onClick } onMouseEnter={ this.mouseEnter } onMouseLeave={ this.mouseLeave }>
                 <div className="mx_MemberTile_avatar">

src/skins/vector/views/molecules/MessageComposer.js

@@ -64,7 +64,7 @@ module.exports = React.createClass({
     render: function() {
         var me = this.props.room.getMember(MatrixClientPeg.get().credentials.userId);
         var uploadInputStyle = {display: 'none'};
-        var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
+        var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
         return (
             <div className="mx_MessageComposer">
                 <div className="mx_MessageComposer_wrapper">

src/skins/vector/views/molecules/RoomHeader.js

@@ -44,7 +44,7 @@ module.exports = React.createClass({
     
     render: function() {
         var EditableText = sdk.getComponent("atoms.EditableText");
-        var RoomAvatar = sdk.getComponent('atoms.RoomAvatar');
+        var RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
 
         var header;
         if (this.props.simpleHeader) {

src/skins/vector/views/molecules/RoomTile.js

@@ -274,7 +274,7 @@ var RoomTile = React.createClass({
             label = <RoomTooltip room={this.props.room}/>;
         }
 
-        var RoomAvatar = sdk.getComponent('atoms.RoomAvatar');
+        var RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
 
         // These props are injected by React DnD,
         // as defined by your `collect` function above: