diff --git a/templates/chats.tpl b/templates/chats.tpl
index d163aeb..5ef5fd5 100644
--- a/templates/chats.tpl
+++ b/templates/chats.tpl
@@ -11,7 +11,7 @@
 		</ul>
 		<ul component="chat/recent" class="chats-list" data-nextstart="{nextStart}">
 			<!-- BEGIN rooms -->
-			<!-- IMPORT partials/chat_recent_room.tpl -->
+			<!-- IMPORT partials/chats/recent_room.tpl -->
 			<!-- END rooms -->
 		</ul>
 	</div>
@@ -31,7 +31,7 @@
 			<input class="form-control" component="chat/room/name" value="{roomName}" <!-- IF !isOwner -->disabled<!-- ENDIF !isOwner -->/>
 
 			<ul class="chat-content">
-				<!-- IMPORT partials/chat_messages.tpl -->
+				<!-- IMPORT partials/chats/messages.tpl -->
 			</ul>
 			<div class="input-group">
 				<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input mousetrap" rows="1"></textarea>
diff --git a/templates/partials/chat_contact.tpl b/templates/partials/chat_contact.tpl
deleted file mode 100644
index c5d2fa2..0000000
--- a/templates/partials/chat_contact.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-			<div data-username="{../username}" data-uid="{../uid}">
-				<!-- IF ../picture -->
-				<img class="user-img" src="{../picture}">
-				<!-- ELSE -->
-				<div class="user-icon user-img" style="background-color: {../icon:bgColor};">{../icon:text}</div>
-				<!-- ENDIF ../picture -->
-				<i component="user/status" title="[[global:{../status}]]" class="fa fa-circle status {../status}"></i>
-				<span class="username">{../username}</span>
-
-			</div>
\ No newline at end of file
diff --git a/templates/partials/chat_contacts.tpl b/templates/partials/chat_contacts.tpl
deleted file mode 100644
index 532132d..0000000
--- a/templates/partials/chat_contacts.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- BEGIN contacts -->
-<!-- IMPORT partials/chat_contact.tpl -->
-<!-- END contacts -->
\ No newline at end of file
diff --git a/templates/partials/chat_messages.tpl b/templates/partials/chat_messages.tpl
deleted file mode 100644
index 81284ef..0000000
--- a/templates/partials/chat_messages.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- BEGIN messages -->
-<!-- IMPORT partials/chat_message.tpl -->
-<!-- END messages -->
\ No newline at end of file
diff --git a/templates/partials/chat_dropdown.tpl b/templates/partials/chats/dropdown.tpl
similarity index 100%
rename from templates/partials/chat_dropdown.tpl
rename to templates/partials/chats/dropdown.tpl
diff --git a/templates/partials/chat_message.tpl b/templates/partials/chats/message.tpl
similarity index 100%
rename from templates/partials/chat_message.tpl
rename to templates/partials/chats/message.tpl
diff --git a/templates/partials/chats/messages.tpl b/templates/partials/chats/messages.tpl
new file mode 100644
index 0000000..e49fa75
--- /dev/null
+++ b/templates/partials/chats/messages.tpl
@@ -0,0 +1,3 @@
+<!-- BEGIN messages -->
+<!-- IMPORT partials/chats/message.tpl -->
+<!-- END messages -->
\ No newline at end of file
diff --git a/templates/partials/chat_recent_room.tpl b/templates/partials/chats/recent_room.tpl
similarity index 100%
rename from templates/partials/chat_recent_room.tpl
rename to templates/partials/chats/recent_room.tpl