diff --git a/src/skins/base/css/atoms/MemberAvatar.css b/src/skins/vector/css/atoms/MemberAvatar.css
similarity index 100%
rename from src/skins/base/css/atoms/MemberAvatar.css
rename to src/skins/vector/css/atoms/MemberAvatar.css
diff --git a/src/skins/base/css/atoms/MessageTimestamp.css b/src/skins/vector/css/atoms/MessageTimestamp.css
similarity index 100%
rename from src/skins/base/css/atoms/MessageTimestamp.css
rename to src/skins/vector/css/atoms/MessageTimestamp.css
diff --git a/src/skins/base/css/common.css b/src/skins/vector/css/common.css
similarity index 100%
rename from src/skins/base/css/common.css
rename to src/skins/vector/css/common.css
diff --git a/src/skins/base/css/hide.css b/src/skins/vector/css/hide.css
similarity index 100%
rename from src/skins/base/css/hide.css
rename to src/skins/vector/css/hide.css
diff --git a/src/skins/base/css/molecules/MImageTile.css b/src/skins/vector/css/molecules/MImageTile.css
similarity index 100%
rename from src/skins/base/css/molecules/MImageTile.css
rename to src/skins/vector/css/molecules/MImageTile.css
diff --git a/src/skins/base/css/molecules/MNoticeTile.css b/src/skins/vector/css/molecules/MNoticeTile.css
similarity index 100%
rename from src/skins/base/css/molecules/MNoticeTile.css
rename to src/skins/vector/css/molecules/MNoticeTile.css
diff --git a/src/skins/base/css/molecules/MTextTile.css b/src/skins/vector/css/molecules/MTextTile.css
similarity index 100%
rename from src/skins/base/css/molecules/MTextTile.css
rename to src/skins/vector/css/molecules/MTextTile.css
diff --git a/src/skins/base/css/molecules/MatrixToolbar.css b/src/skins/vector/css/molecules/MatrixToolbar.css
similarity index 100%
rename from src/skins/base/css/molecules/MatrixToolbar.css
rename to src/skins/vector/css/molecules/MatrixToolbar.css
diff --git a/src/skins/base/css/molecules/MemberInfo.css b/src/skins/vector/css/molecules/MemberInfo.css
similarity index 100%
rename from src/skins/base/css/molecules/MemberInfo.css
rename to src/skins/vector/css/molecules/MemberInfo.css
diff --git a/src/skins/base/css/molecules/MemberTile.css b/src/skins/vector/css/molecules/MemberTile.css
similarity index 100%
rename from src/skins/base/css/molecules/MemberTile.css
rename to src/skins/vector/css/molecules/MemberTile.css
diff --git a/src/skins/base/css/molecules/MessageComposer.css b/src/skins/vector/css/molecules/MessageComposer.css
similarity index 100%
rename from src/skins/base/css/molecules/MessageComposer.css
rename to src/skins/vector/css/molecules/MessageComposer.css
diff --git a/src/skins/base/css/molecules/MessageTile.css b/src/skins/vector/css/molecules/MessageTile.css
similarity index 100%
rename from src/skins/base/css/molecules/MessageTile.css
rename to src/skins/vector/css/molecules/MessageTile.css
diff --git a/src/skins/base/css/molecules/ProgressBar.css b/src/skins/vector/css/molecules/ProgressBar.css
similarity index 100%
rename from src/skins/base/css/molecules/ProgressBar.css
rename to src/skins/vector/css/molecules/ProgressBar.css
diff --git a/src/skins/base/css/molecules/RoomDropTarget.css b/src/skins/vector/css/molecules/RoomDropTarget.css
similarity index 100%
rename from src/skins/base/css/molecules/RoomDropTarget.css
rename to src/skins/vector/css/molecules/RoomDropTarget.css
diff --git a/src/skins/base/css/molecules/RoomHeader.css b/src/skins/vector/css/molecules/RoomHeader.css
similarity index 100%
rename from src/skins/base/css/molecules/RoomHeader.css
rename to src/skins/vector/css/molecules/RoomHeader.css
diff --git a/src/skins/base/css/molecules/RoomSettings.css b/src/skins/vector/css/molecules/RoomSettings.css
similarity index 100%
rename from src/skins/base/css/molecules/RoomSettings.css
rename to src/skins/vector/css/molecules/RoomSettings.css
diff --git a/src/skins/base/css/molecules/RoomTile.css b/src/skins/vector/css/molecules/RoomTile.css
similarity index 100%
rename from src/skins/base/css/molecules/RoomTile.css
rename to src/skins/vector/css/molecules/RoomTile.css
diff --git a/src/skins/base/css/molecules/SenderProfile.css b/src/skins/vector/css/molecules/SenderProfile.css
similarity index 100%
rename from src/skins/base/css/molecules/SenderProfile.css
rename to src/skins/vector/css/molecules/SenderProfile.css
diff --git a/src/skins/base/css/molecules/ServerConfig.css b/src/skins/vector/css/molecules/ServerConfig.css
similarity index 100%
rename from src/skins/base/css/molecules/ServerConfig.css
rename to src/skins/vector/css/molecules/ServerConfig.css
diff --git a/src/skins/base/css/molecules/voip/CallView.css b/src/skins/vector/css/molecules/voip/CallView.css
similarity index 100%
rename from src/skins/base/css/molecules/voip/CallView.css
rename to src/skins/vector/css/molecules/voip/CallView.css
diff --git a/src/skins/base/css/molecules/voip/IncomingCallbox.css b/src/skins/vector/css/molecules/voip/IncomingCallbox.css
similarity index 100%
rename from src/skins/base/css/molecules/voip/IncomingCallbox.css
rename to src/skins/vector/css/molecules/voip/IncomingCallbox.css
diff --git a/src/skins/base/css/molecules/voip/VideoView.css b/src/skins/vector/css/molecules/voip/VideoView.css
similarity index 100%
rename from src/skins/base/css/molecules/voip/VideoView.css
rename to src/skins/vector/css/molecules/voip/VideoView.css
diff --git a/src/skins/base/css/organisms/CreateRoom.css b/src/skins/vector/css/organisms/CreateRoom.css
similarity index 100%
rename from src/skins/base/css/organisms/CreateRoom.css
rename to src/skins/vector/css/organisms/CreateRoom.css
diff --git a/src/skins/base/css/organisms/LeftPanel.css b/src/skins/vector/css/organisms/LeftPanel.css
similarity index 100%
rename from src/skins/base/css/organisms/LeftPanel.css
rename to src/skins/vector/css/organisms/LeftPanel.css
diff --git a/src/skins/base/css/organisms/MemberList.css b/src/skins/vector/css/organisms/MemberList.css
similarity index 100%
rename from src/skins/base/css/organisms/MemberList.css
rename to src/skins/vector/css/organisms/MemberList.css
diff --git a/src/skins/base/css/organisms/RightPanel.css b/src/skins/vector/css/organisms/RightPanel.css
similarity index 100%
rename from src/skins/base/css/organisms/RightPanel.css
rename to src/skins/vector/css/organisms/RightPanel.css
diff --git a/src/skins/base/css/organisms/RoomDirectory.css b/src/skins/vector/css/organisms/RoomDirectory.css
similarity index 100%
rename from src/skins/base/css/organisms/RoomDirectory.css
rename to src/skins/vector/css/organisms/RoomDirectory.css
diff --git a/src/skins/base/css/organisms/RoomList.css b/src/skins/vector/css/organisms/RoomList.css
similarity index 100%
rename from src/skins/base/css/organisms/RoomList.css
rename to src/skins/vector/css/organisms/RoomList.css
diff --git a/src/skins/base/css/organisms/RoomView.css b/src/skins/vector/css/organisms/RoomView.css
similarity index 100%
rename from src/skins/base/css/organisms/RoomView.css
rename to src/skins/vector/css/organisms/RoomView.css
diff --git a/src/skins/base/css/organisms/UserSettings.css b/src/skins/vector/css/organisms/UserSettings.css
similarity index 100%
rename from src/skins/base/css/organisms/UserSettings.css
rename to src/skins/vector/css/organisms/UserSettings.css
diff --git a/src/skins/base/css/pages/MatrixChat.css b/src/skins/vector/css/pages/MatrixChat.css
similarity index 100%
rename from src/skins/base/css/pages/MatrixChat.css
rename to src/skins/vector/css/pages/MatrixChat.css
diff --git a/src/skins/base/css/templates/Login.css b/src/skins/vector/css/templates/Login.css
similarity index 100%
rename from src/skins/base/css/templates/Login.css
rename to src/skins/vector/css/templates/Login.css
diff --git a/src/skins/base/fonts/22JRxvfANxSmnAhzbFH8PgLUuEpTyoUstqEm5AMlJo4.woff2 b/src/skins/vector/fonts/22JRxvfANxSmnAhzbFH8PgLUuEpTyoUstqEm5AMlJo4.woff2
similarity index 100%
rename from src/skins/base/fonts/22JRxvfANxSmnAhzbFH8PgLUuEpTyoUstqEm5AMlJo4.woff2
rename to src/skins/vector/fonts/22JRxvfANxSmnAhzbFH8PgLUuEpTyoUstqEm5AMlJo4.woff2
diff --git a/src/skins/base/fonts/8qcEw_nrk_5HEcCpYdJu8BTbgVql8nDJpwnrE27mub0.woff2 b/src/skins/vector/fonts/8qcEw_nrk_5HEcCpYdJu8BTbgVql8nDJpwnrE27mub0.woff2
similarity index 100%
rename from src/skins/base/fonts/8qcEw_nrk_5HEcCpYdJu8BTbgVql8nDJpwnrE27mub0.woff2
rename to src/skins/vector/fonts/8qcEw_nrk_5HEcCpYdJu8BTbgVql8nDJpwnrE27mub0.woff2
diff --git a/src/skins/base/fonts/IY9HZVvI1cMoAHxvl0w9LVKPGs1ZzpMvnHX-7fPOuAc.woff2 b/src/skins/vector/fonts/IY9HZVvI1cMoAHxvl0w9LVKPGs1ZzpMvnHX-7fPOuAc.woff2
similarity index 100%
rename from src/skins/base/fonts/IY9HZVvI1cMoAHxvl0w9LVKPGs1ZzpMvnHX-7fPOuAc.woff2
rename to src/skins/vector/fonts/IY9HZVvI1cMoAHxvl0w9LVKPGs1ZzpMvnHX-7fPOuAc.woff2
diff --git a/src/skins/base/fonts/Lato.css b/src/skins/vector/fonts/Lato.css
similarity index 100%
rename from src/skins/base/fonts/Lato.css
rename to src/skins/vector/fonts/Lato.css
diff --git a/src/skins/base/fonts/MDadn8DQ_3oT6kvnUq_2r_esZW2xOQ-xsNqO47m55DA.woff2 b/src/skins/vector/fonts/MDadn8DQ_3oT6kvnUq_2r_esZW2xOQ-xsNqO47m55DA.woff2
similarity index 100%
rename from src/skins/base/fonts/MDadn8DQ_3oT6kvnUq_2r_esZW2xOQ-xsNqO47m55DA.woff2
rename to src/skins/vector/fonts/MDadn8DQ_3oT6kvnUq_2r_esZW2xOQ-xsNqO47m55DA.woff2
diff --git a/src/skins/base/fonts/MgNNr5y1C_tIEuLEmicLmwLUuEpTyoUstqEm5AMlJo4.woff2 b/src/skins/vector/fonts/MgNNr5y1C_tIEuLEmicLmwLUuEpTyoUstqEm5AMlJo4.woff2
similarity index 100%
rename from src/skins/base/fonts/MgNNr5y1C_tIEuLEmicLmwLUuEpTyoUstqEm5AMlJo4.woff2
rename to src/skins/vector/fonts/MgNNr5y1C_tIEuLEmicLmwLUuEpTyoUstqEm5AMlJo4.woff2
diff --git a/src/skins/base/fonts/rZPI2gHXi8zxUjnybc2ZQFKPGs1ZzpMvnHX-7fPOuAc.woff2 b/src/skins/vector/fonts/rZPI2gHXi8zxUjnybc2ZQFKPGs1ZzpMvnHX-7fPOuAc.woff2
similarity index 100%
rename from src/skins/base/fonts/rZPI2gHXi8zxUjnybc2ZQFKPGs1ZzpMvnHX-7fPOuAc.woff2
rename to src/skins/vector/fonts/rZPI2gHXi8zxUjnybc2ZQFKPGs1ZzpMvnHX-7fPOuAc.woff2
diff --git a/src/skins/base/img/attach.png b/src/skins/vector/img/attach.png
similarity index 100%
rename from src/skins/base/img/attach.png
rename to src/skins/vector/img/attach.png
diff --git a/src/skins/base/img/chevron-left.png b/src/skins/vector/img/chevron-left.png
similarity index 100%
rename from src/skins/base/img/chevron-left.png
rename to src/skins/vector/img/chevron-left.png
diff --git a/src/skins/base/img/chevron-right.png b/src/skins/vector/img/chevron-right.png
similarity index 100%
rename from src/skins/base/img/chevron-right.png
rename to src/skins/vector/img/chevron-right.png
diff --git a/src/skins/base/img/chevron.png b/src/skins/vector/img/chevron.png
similarity index 100%
rename from src/skins/base/img/chevron.png
rename to src/skins/vector/img/chevron.png
diff --git a/src/skins/base/img/close-white.png b/src/skins/vector/img/close-white.png
similarity index 100%
rename from src/skins/base/img/close-white.png
rename to src/skins/vector/img/close-white.png
diff --git a/src/skins/base/img/create-big.png b/src/skins/vector/img/create-big.png
similarity index 100%
rename from src/skins/base/img/create-big.png
rename to src/skins/vector/img/create-big.png
diff --git a/src/skins/base/img/create.png b/src/skins/vector/img/create.png
similarity index 100%
rename from src/skins/base/img/create.png
rename to src/skins/vector/img/create.png
diff --git a/src/skins/base/img/delete.png b/src/skins/vector/img/delete.png
similarity index 100%
rename from src/skins/base/img/delete.png
rename to src/skins/vector/img/delete.png
diff --git a/src/skins/base/img/directory-big.png b/src/skins/vector/img/directory-big.png
similarity index 100%
rename from src/skins/base/img/directory-big.png
rename to src/skins/vector/img/directory-big.png
diff --git a/src/skins/base/img/download.png b/src/skins/vector/img/download.png
similarity index 100%
rename from src/skins/base/img/download.png
rename to src/skins/vector/img/download.png
diff --git a/src/skins/base/img/edit.png b/src/skins/vector/img/edit.png
similarity index 100%
rename from src/skins/base/img/edit.png
rename to src/skins/vector/img/edit.png
diff --git a/src/skins/base/img/file.png b/src/skins/vector/img/file.png
similarity index 100%
rename from src/skins/base/img/file.png
rename to src/skins/vector/img/file.png
diff --git a/src/skins/base/img/filegrid.png b/src/skins/vector/img/filegrid.png
similarity index 100%
rename from src/skins/base/img/filegrid.png
rename to src/skins/vector/img/filegrid.png
diff --git a/src/skins/base/img/filelist.png b/src/skins/vector/img/filelist.png
similarity index 100%
rename from src/skins/base/img/filelist.png
rename to src/skins/vector/img/filelist.png
diff --git a/src/skins/base/img/hide.png b/src/skins/vector/img/hide.png
similarity index 100%
rename from src/skins/base/img/hide.png
rename to src/skins/vector/img/hide.png
diff --git a/src/skins/base/img/info.png b/src/skins/vector/img/info.png
similarity index 100%
rename from src/skins/base/img/info.png
rename to src/skins/vector/img/info.png
diff --git a/src/skins/base/img/logo.png b/src/skins/vector/img/logo.png
similarity index 100%
rename from src/skins/base/img/logo.png
rename to src/skins/vector/img/logo.png
diff --git a/src/skins/base/img/members.png b/src/skins/vector/img/members.png
similarity index 100%
rename from src/skins/base/img/members.png
rename to src/skins/vector/img/members.png
diff --git a/src/skins/base/img/menu.png b/src/skins/vector/img/menu.png
similarity index 100%
rename from src/skins/base/img/menu.png
rename to src/skins/vector/img/menu.png
diff --git a/src/skins/base/img/newmessages.png b/src/skins/vector/img/newmessages.png
similarity index 100%
rename from src/skins/base/img/newmessages.png
rename to src/skins/vector/img/newmessages.png
diff --git a/src/skins/base/img/p/p0.png b/src/skins/vector/img/p/p0.png
similarity index 100%
rename from src/skins/base/img/p/p0.png
rename to src/skins/vector/img/p/p0.png
diff --git a/src/skins/base/img/p/p1.png b/src/skins/vector/img/p/p1.png
similarity index 100%
rename from src/skins/base/img/p/p1.png
rename to src/skins/vector/img/p/p1.png
diff --git a/src/skins/base/img/p/p10.png b/src/skins/vector/img/p/p10.png
similarity index 100%
rename from src/skins/base/img/p/p10.png
rename to src/skins/vector/img/p/p10.png
diff --git a/src/skins/base/img/p/p11.png b/src/skins/vector/img/p/p11.png
similarity index 100%
rename from src/skins/base/img/p/p11.png
rename to src/skins/vector/img/p/p11.png
diff --git a/src/skins/base/img/p/p12.png b/src/skins/vector/img/p/p12.png
similarity index 100%
rename from src/skins/base/img/p/p12.png
rename to src/skins/vector/img/p/p12.png
diff --git a/src/skins/base/img/p/p13.png b/src/skins/vector/img/p/p13.png
similarity index 100%
rename from src/skins/base/img/p/p13.png
rename to src/skins/vector/img/p/p13.png
diff --git a/src/skins/base/img/p/p14.png b/src/skins/vector/img/p/p14.png
similarity index 100%
rename from src/skins/base/img/p/p14.png
rename to src/skins/vector/img/p/p14.png
diff --git a/src/skins/base/img/p/p15.png b/src/skins/vector/img/p/p15.png
similarity index 100%
rename from src/skins/base/img/p/p15.png
rename to src/skins/vector/img/p/p15.png
diff --git a/src/skins/base/img/p/p16.png b/src/skins/vector/img/p/p16.png
similarity index 100%
rename from src/skins/base/img/p/p16.png
rename to src/skins/vector/img/p/p16.png
diff --git a/src/skins/base/img/p/p17.png b/src/skins/vector/img/p/p17.png
similarity index 100%
rename from src/skins/base/img/p/p17.png
rename to src/skins/vector/img/p/p17.png
diff --git a/src/skins/base/img/p/p18.png b/src/skins/vector/img/p/p18.png
similarity index 100%
rename from src/skins/base/img/p/p18.png
rename to src/skins/vector/img/p/p18.png
diff --git a/src/skins/base/img/p/p19.png b/src/skins/vector/img/p/p19.png
similarity index 100%
rename from src/skins/base/img/p/p19.png
rename to src/skins/vector/img/p/p19.png
diff --git a/src/skins/base/img/p/p2.png b/src/skins/vector/img/p/p2.png
similarity index 100%
rename from src/skins/base/img/p/p2.png
rename to src/skins/vector/img/p/p2.png
diff --git a/src/skins/base/img/p/p20.png b/src/skins/vector/img/p/p20.png
similarity index 100%
rename from src/skins/base/img/p/p20.png
rename to src/skins/vector/img/p/p20.png
diff --git a/src/skins/base/img/p/p3.png b/src/skins/vector/img/p/p3.png
similarity index 100%
rename from src/skins/base/img/p/p3.png
rename to src/skins/vector/img/p/p3.png
diff --git a/src/skins/base/img/p/p4.png b/src/skins/vector/img/p/p4.png
similarity index 100%
rename from src/skins/base/img/p/p4.png
rename to src/skins/vector/img/p/p4.png
diff --git a/src/skins/base/img/p/p5.png b/src/skins/vector/img/p/p5.png
similarity index 100%
rename from src/skins/base/img/p/p5.png
rename to src/skins/vector/img/p/p5.png
diff --git a/src/skins/base/img/p/p6.png b/src/skins/vector/img/p/p6.png
similarity index 100%
rename from src/skins/base/img/p/p6.png
rename to src/skins/vector/img/p/p6.png
diff --git a/src/skins/base/img/p/p7.png b/src/skins/vector/img/p/p7.png
similarity index 100%
rename from src/skins/base/img/p/p7.png
rename to src/skins/vector/img/p/p7.png
diff --git a/src/skins/base/img/p/p8.png b/src/skins/vector/img/p/p8.png
similarity index 100%
rename from src/skins/base/img/p/p8.png
rename to src/skins/vector/img/p/p8.png
diff --git a/src/skins/base/img/p/p9.png b/src/skins/vector/img/p/p9.png
similarity index 100%
rename from src/skins/base/img/p/p9.png
rename to src/skins/vector/img/p/p9.png
diff --git a/src/skins/base/img/p/piechart.pde b/src/skins/vector/img/p/piechart.pde
similarity index 100%
rename from src/skins/base/img/p/piechart.pde
rename to src/skins/vector/img/p/piechart.pde
diff --git a/src/skins/base/img/placeholder.png b/src/skins/vector/img/placeholder.png
similarity index 100%
rename from src/skins/base/img/placeholder.png
rename to src/skins/vector/img/placeholder.png
diff --git a/src/skins/base/img/search.png b/src/skins/vector/img/search.png
similarity index 100%
rename from src/skins/base/img/search.png
rename to src/skins/vector/img/search.png
diff --git a/src/skins/base/img/settings-big.png b/src/skins/vector/img/settings-big.png
similarity index 100%
rename from src/skins/base/img/settings-big.png
rename to src/skins/vector/img/settings-big.png
diff --git a/src/skins/base/img/settings.png b/src/skins/vector/img/settings.png
similarity index 100%
rename from src/skins/base/img/settings.png
rename to src/skins/vector/img/settings.png
diff --git a/src/skins/base/img/typing.png b/src/skins/vector/img/typing.png
similarity index 100%
rename from src/skins/base/img/typing.png
rename to src/skins/vector/img/typing.png
diff --git a/src/skins/base/img/upload-big.png b/src/skins/vector/img/upload-big.png
similarity index 100%
rename from src/skins/base/img/upload-big.png
rename to src/skins/vector/img/upload-big.png
diff --git a/src/skins/base/img/upload.png b/src/skins/vector/img/upload.png
similarity index 100%
rename from src/skins/base/img/upload.png
rename to src/skins/vector/img/upload.png
diff --git a/src/skins/base/img/video.png b/src/skins/vector/img/video.png
similarity index 100%
rename from src/skins/base/img/video.png
rename to src/skins/vector/img/video.png
diff --git a/src/skins/base/img/voip.png b/src/skins/vector/img/voip.png
similarity index 100%
rename from src/skins/base/img/voip.png
rename to src/skins/vector/img/voip.png
diff --git a/src/skins/base/views/atoms/EditableText.js b/src/skins/vector/views/atoms/EditableText.js
similarity index 100%
rename from src/skins/base/views/atoms/EditableText.js
rename to src/skins/vector/views/atoms/EditableText.js
diff --git a/src/skins/base/views/atoms/EnableNotificationsButton.js b/src/skins/vector/views/atoms/EnableNotificationsButton.js
similarity index 100%
rename from src/skins/base/views/atoms/EnableNotificationsButton.js
rename to src/skins/vector/views/atoms/EnableNotificationsButton.js
diff --git a/src/skins/base/views/atoms/ImageView.js b/src/skins/vector/views/atoms/ImageView.js
similarity index 100%
rename from src/skins/base/views/atoms/ImageView.js
rename to src/skins/vector/views/atoms/ImageView.js
diff --git a/src/skins/base/views/atoms/LogoutButton.js b/src/skins/vector/views/atoms/LogoutButton.js
similarity index 100%
rename from src/skins/base/views/atoms/LogoutButton.js
rename to src/skins/vector/views/atoms/LogoutButton.js
diff --git a/src/skins/base/views/atoms/MemberAvatar.js b/src/skins/vector/views/atoms/MemberAvatar.js
similarity index 100%
rename from src/skins/base/views/atoms/MemberAvatar.js
rename to src/skins/vector/views/atoms/MemberAvatar.js
diff --git a/src/skins/base/views/atoms/MessageTimestamp.js b/src/skins/vector/views/atoms/MessageTimestamp.js
similarity index 100%
rename from src/skins/base/views/atoms/MessageTimestamp.js
rename to src/skins/vector/views/atoms/MessageTimestamp.js
diff --git a/src/skins/base/views/atoms/RoomAvatar.js b/src/skins/vector/views/atoms/RoomAvatar.js
similarity index 100%
rename from src/skins/base/views/atoms/RoomAvatar.js
rename to src/skins/vector/views/atoms/RoomAvatar.js
diff --git a/src/skins/base/views/atoms/create_room/CreateRoomButton.js b/src/skins/vector/views/atoms/create_room/CreateRoomButton.js
similarity index 100%
rename from src/skins/base/views/atoms/create_room/CreateRoomButton.js
rename to src/skins/vector/views/atoms/create_room/CreateRoomButton.js
diff --git a/src/skins/base/views/atoms/create_room/Presets.js b/src/skins/vector/views/atoms/create_room/Presets.js
similarity index 100%
rename from src/skins/base/views/atoms/create_room/Presets.js
rename to src/skins/vector/views/atoms/create_room/Presets.js
diff --git a/src/skins/base/views/atoms/create_room/RoomAlias.js b/src/skins/vector/views/atoms/create_room/RoomAlias.js
similarity index 100%
rename from src/skins/base/views/atoms/create_room/RoomAlias.js
rename to src/skins/vector/views/atoms/create_room/RoomAlias.js
diff --git a/src/skins/base/views/atoms/voip/VideoFeed.js b/src/skins/vector/views/atoms/voip/VideoFeed.js
similarity index 100%
rename from src/skins/base/views/atoms/voip/VideoFeed.js
rename to src/skins/vector/views/atoms/voip/VideoFeed.js
diff --git a/src/skins/base/views/molecules/BottomLeftMenu.js b/src/skins/vector/views/molecules/BottomLeftMenu.js
similarity index 100%
rename from src/skins/base/views/molecules/BottomLeftMenu.js
rename to src/skins/vector/views/molecules/BottomLeftMenu.js
diff --git a/src/skins/base/views/molecules/ChangeAvatar.js b/src/skins/vector/views/molecules/ChangeAvatar.js
similarity index 100%
rename from src/skins/base/views/molecules/ChangeAvatar.js
rename to src/skins/vector/views/molecules/ChangeAvatar.js
diff --git a/src/skins/base/views/molecules/ChangePassword.js b/src/skins/vector/views/molecules/ChangePassword.js
similarity index 100%
rename from src/skins/base/views/molecules/ChangePassword.js
rename to src/skins/vector/views/molecules/ChangePassword.js
diff --git a/src/skins/base/views/molecules/ContextualMenu.js b/src/skins/vector/views/molecules/ContextualMenu.js
similarity index 100%
rename from src/skins/base/views/molecules/ContextualMenu.js
rename to src/skins/vector/views/molecules/ContextualMenu.js
diff --git a/src/skins/base/views/molecules/DateSeparator.js b/src/skins/vector/views/molecules/DateSeparator.js
similarity index 100%
rename from src/skins/base/views/molecules/DateSeparator.js
rename to src/skins/vector/views/molecules/DateSeparator.js
diff --git a/src/skins/base/views/molecules/EventAsTextTile.js b/src/skins/vector/views/molecules/EventAsTextTile.js
similarity index 100%
rename from src/skins/base/views/molecules/EventAsTextTile.js
rename to src/skins/vector/views/molecules/EventAsTextTile.js
diff --git a/src/skins/base/views/molecules/MEmoteTile.js b/src/skins/vector/views/molecules/MEmoteTile.js
similarity index 100%
rename from src/skins/base/views/molecules/MEmoteTile.js
rename to src/skins/vector/views/molecules/MEmoteTile.js
diff --git a/src/skins/base/views/molecules/MFileTile.js b/src/skins/vector/views/molecules/MFileTile.js
similarity index 100%
rename from src/skins/base/views/molecules/MFileTile.js
rename to src/skins/vector/views/molecules/MFileTile.js
diff --git a/src/skins/base/views/molecules/MImageTile.js b/src/skins/vector/views/molecules/MImageTile.js
similarity index 100%
rename from src/skins/base/views/molecules/MImageTile.js
rename to src/skins/vector/views/molecules/MImageTile.js
diff --git a/src/skins/base/views/molecules/MNoticeTile.js b/src/skins/vector/views/molecules/MNoticeTile.js
similarity index 100%
rename from src/skins/base/views/molecules/MNoticeTile.js
rename to src/skins/vector/views/molecules/MNoticeTile.js
diff --git a/src/skins/base/views/molecules/MRoomMemberTile.js b/src/skins/vector/views/molecules/MRoomMemberTile.js
similarity index 100%
rename from src/skins/base/views/molecules/MRoomMemberTile.js
rename to src/skins/vector/views/molecules/MRoomMemberTile.js
diff --git a/src/skins/base/views/molecules/MTextTile.js b/src/skins/vector/views/molecules/MTextTile.js
similarity index 100%
rename from src/skins/base/views/molecules/MTextTile.js
rename to src/skins/vector/views/molecules/MTextTile.js
diff --git a/src/skins/base/views/molecules/MatrixToolbar.js b/src/skins/vector/views/molecules/MatrixToolbar.js
similarity index 100%
rename from src/skins/base/views/molecules/MatrixToolbar.js
rename to src/skins/vector/views/molecules/MatrixToolbar.js
diff --git a/src/skins/base/views/molecules/MemberInfo.js b/src/skins/vector/views/molecules/MemberInfo.js
similarity index 100%
rename from src/skins/base/views/molecules/MemberInfo.js
rename to src/skins/vector/views/molecules/MemberInfo.js
diff --git a/src/skins/base/views/molecules/MemberTile.js b/src/skins/vector/views/molecules/MemberTile.js
similarity index 100%
rename from src/skins/base/views/molecules/MemberTile.js
rename to src/skins/vector/views/molecules/MemberTile.js
diff --git a/src/skins/base/views/molecules/MessageComposer.js b/src/skins/vector/views/molecules/MessageComposer.js
similarity index 100%
rename from src/skins/base/views/molecules/MessageComposer.js
rename to src/skins/vector/views/molecules/MessageComposer.js
diff --git a/src/skins/base/views/molecules/MessageTile.js b/src/skins/vector/views/molecules/MessageTile.js
similarity index 100%
rename from src/skins/base/views/molecules/MessageTile.js
rename to src/skins/vector/views/molecules/MessageTile.js
diff --git a/src/skins/base/views/molecules/ProgressBar.js b/src/skins/vector/views/molecules/ProgressBar.js
similarity index 100%
rename from src/skins/base/views/molecules/ProgressBar.js
rename to src/skins/vector/views/molecules/ProgressBar.js
diff --git a/src/skins/base/views/molecules/RoomCreate.js b/src/skins/vector/views/molecules/RoomCreate.js
similarity index 100%
rename from src/skins/base/views/molecules/RoomCreate.js
rename to src/skins/vector/views/molecules/RoomCreate.js
diff --git a/src/skins/base/views/molecules/RoomDropTarget.js b/src/skins/vector/views/molecules/RoomDropTarget.js
similarity index 100%
rename from src/skins/base/views/molecules/RoomDropTarget.js
rename to src/skins/vector/views/molecules/RoomDropTarget.js
diff --git a/src/skins/base/views/molecules/RoomHeader.js b/src/skins/vector/views/molecules/RoomHeader.js
similarity index 100%
rename from src/skins/base/views/molecules/RoomHeader.js
rename to src/skins/vector/views/molecules/RoomHeader.js
diff --git a/src/skins/base/views/molecules/RoomSettings.js b/src/skins/vector/views/molecules/RoomSettings.js
similarity index 100%
rename from src/skins/base/views/molecules/RoomSettings.js
rename to src/skins/vector/views/molecules/RoomSettings.js
diff --git a/src/skins/base/views/molecules/RoomTile.js b/src/skins/vector/views/molecules/RoomTile.js
similarity index 100%
rename from src/skins/base/views/molecules/RoomTile.js
rename to src/skins/vector/views/molecules/RoomTile.js
diff --git a/src/skins/base/views/molecules/SenderProfile.js b/src/skins/vector/views/molecules/SenderProfile.js
similarity index 100%
rename from src/skins/base/views/molecules/SenderProfile.js
rename to src/skins/vector/views/molecules/SenderProfile.js
diff --git a/src/skins/base/views/molecules/ServerConfig.js b/src/skins/vector/views/molecules/ServerConfig.js
similarity index 100%
rename from src/skins/base/views/molecules/ServerConfig.js
rename to src/skins/vector/views/molecules/ServerConfig.js
diff --git a/src/skins/base/views/molecules/UnknownMessageTile.js b/src/skins/vector/views/molecules/UnknownMessageTile.js
similarity index 100%
rename from src/skins/base/views/molecules/UnknownMessageTile.js
rename to src/skins/vector/views/molecules/UnknownMessageTile.js
diff --git a/src/skins/base/views/molecules/UserSelector.js b/src/skins/vector/views/molecules/UserSelector.js
similarity index 100%
rename from src/skins/base/views/molecules/UserSelector.js
rename to src/skins/vector/views/molecules/UserSelector.js
diff --git a/src/skins/base/views/molecules/voip/CallView.js b/src/skins/vector/views/molecules/voip/CallView.js
similarity index 100%
rename from src/skins/base/views/molecules/voip/CallView.js
rename to src/skins/vector/views/molecules/voip/CallView.js
diff --git a/src/skins/base/views/molecules/voip/IncomingCallBox.js b/src/skins/vector/views/molecules/voip/IncomingCallBox.js
similarity index 100%
rename from src/skins/base/views/molecules/voip/IncomingCallBox.js
rename to src/skins/vector/views/molecules/voip/IncomingCallBox.js
diff --git a/src/skins/base/views/molecules/voip/VideoView.js b/src/skins/vector/views/molecules/voip/VideoView.js
similarity index 100%
rename from src/skins/base/views/molecules/voip/VideoView.js
rename to src/skins/vector/views/molecules/voip/VideoView.js
diff --git a/src/skins/base/views/organisms/CreateRoom.js b/src/skins/vector/views/organisms/CreateRoom.js
similarity index 100%
rename from src/skins/base/views/organisms/CreateRoom.js
rename to src/skins/vector/views/organisms/CreateRoom.js
diff --git a/src/skins/base/views/organisms/ErrorDialog.js b/src/skins/vector/views/organisms/ErrorDialog.js
similarity index 100%
rename from src/skins/base/views/organisms/ErrorDialog.js
rename to src/skins/vector/views/organisms/ErrorDialog.js
diff --git a/src/skins/base/views/organisms/LeftPanel.js b/src/skins/vector/views/organisms/LeftPanel.js
similarity index 100%
rename from src/skins/base/views/organisms/LeftPanel.js
rename to src/skins/vector/views/organisms/LeftPanel.js
diff --git a/src/skins/base/views/organisms/LogoutPrompt.js b/src/skins/vector/views/organisms/LogoutPrompt.js
similarity index 100%
rename from src/skins/base/views/organisms/LogoutPrompt.js
rename to src/skins/vector/views/organisms/LogoutPrompt.js
diff --git a/src/skins/base/views/organisms/MemberList.js b/src/skins/vector/views/organisms/MemberList.js
similarity index 100%
rename from src/skins/base/views/organisms/MemberList.js
rename to src/skins/vector/views/organisms/MemberList.js
diff --git a/src/skins/base/views/organisms/Notifier.js b/src/skins/vector/views/organisms/Notifier.js
similarity index 100%
rename from src/skins/base/views/organisms/Notifier.js
rename to src/skins/vector/views/organisms/Notifier.js
diff --git a/src/skins/base/views/organisms/QuestionDialog.js b/src/skins/vector/views/organisms/QuestionDialog.js
similarity index 100%
rename from src/skins/base/views/organisms/QuestionDialog.js
rename to src/skins/vector/views/organisms/QuestionDialog.js
diff --git a/src/skins/base/views/organisms/RightPanel.js b/src/skins/vector/views/organisms/RightPanel.js
similarity index 100%
rename from src/skins/base/views/organisms/RightPanel.js
rename to src/skins/vector/views/organisms/RightPanel.js
diff --git a/src/skins/base/views/organisms/RoomDirectory.js b/src/skins/vector/views/organisms/RoomDirectory.js
similarity index 100%
rename from src/skins/base/views/organisms/RoomDirectory.js
rename to src/skins/vector/views/organisms/RoomDirectory.js
diff --git a/src/skins/base/views/organisms/RoomList.js b/src/skins/vector/views/organisms/RoomList.js
similarity index 100%
rename from src/skins/base/views/organisms/RoomList.js
rename to src/skins/vector/views/organisms/RoomList.js
diff --git a/src/skins/base/views/organisms/RoomView.js b/src/skins/vector/views/organisms/RoomView.js
similarity index 100%
rename from src/skins/base/views/organisms/RoomView.js
rename to src/skins/vector/views/organisms/RoomView.js
diff --git a/src/skins/base/views/organisms/UserSettings.js b/src/skins/vector/views/organisms/UserSettings.js
similarity index 100%
rename from src/skins/base/views/organisms/UserSettings.js
rename to src/skins/vector/views/organisms/UserSettings.js
diff --git a/src/skins/base/views/pages/MatrixChat.js b/src/skins/vector/views/pages/MatrixChat.js
similarity index 100%
rename from src/skins/base/views/pages/MatrixChat.js
rename to src/skins/vector/views/pages/MatrixChat.js
diff --git a/src/skins/base/views/templates/Login.js b/src/skins/vector/views/templates/Login.js
similarity index 100%
rename from src/skins/base/views/templates/Login.js
rename to src/skins/vector/views/templates/Login.js
diff --git a/src/skins/base/views/templates/Register.js b/src/skins/vector/views/templates/Register.js
similarity index 100%
rename from src/skins/base/views/templates/Register.js
rename to src/skins/vector/views/templates/Register.js