diff --git a/pyrogram/client/types/__init__.py b/pyrogram/client/types/__init__.py
index 46332453..13198982 100644
--- a/pyrogram/client/types/__init__.py
+++ b/pyrogram/client/types/__init__.py
@@ -17,12 +17,6 @@
 # along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
 from .callback_query import CallbackQuery
-from .chat import Chat
-from .chat_member import ChatMember
-from .chat_members import ChatMembers
-from .chat_photo import ChatPhoto
-from .dialog import Dialog
-from .dialogs import Dialogs
 from .input_media import (
     InputMediaAudio, InputPhoneContact, InputMediaVideo, InputMediaPhoto,
     InputMediaDocument, InputMediaAnimation
@@ -39,4 +33,7 @@ from .reply_markup import (
     KeyboardButton, ReplyKeyboardMarkup, ReplyKeyboardRemove
 )
 from .update import Update
-from .user import User
+from .user_and_chats import (
+    Chat, ChatMember, ChatMembers, ChatPhoto,
+    Dialog, Dialogs, User
+)
diff --git a/pyrogram/client/types/user_and_chats/__init__.py b/pyrogram/client/types/user_and_chats/__init__.py
new file mode 100644
index 00000000..45915edc
--- /dev/null
+++ b/pyrogram/client/types/user_and_chats/__init__.py
@@ -0,0 +1,25 @@
+# Pyrogram - Telegram MTProto API Client Library for Python
+# Copyright (C) 2017-2018 Dan Tès <https://github.com/delivrance>
+#
+# This file is part of Pyrogram.
+#
+# Pyrogram is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Pyrogram is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
+
+from .chat import Chat
+from .chat_member import ChatMember
+from .chat_members import ChatMembers
+from .chat_photo import ChatPhoto
+from .dialog import Dialog
+from .dialogs import Dialogs
+from .user import User
diff --git a/pyrogram/client/types/chat.py b/pyrogram/client/types/user_and_chats/chat.py
similarity index 100%
rename from pyrogram/client/types/chat.py
rename to pyrogram/client/types/user_and_chats/chat.py
diff --git a/pyrogram/client/types/chat_member.py b/pyrogram/client/types/user_and_chats/chat_member.py
similarity index 100%
rename from pyrogram/client/types/chat_member.py
rename to pyrogram/client/types/user_and_chats/chat_member.py
diff --git a/pyrogram/client/types/chat_members.py b/pyrogram/client/types/user_and_chats/chat_members.py
similarity index 100%
rename from pyrogram/client/types/chat_members.py
rename to pyrogram/client/types/user_and_chats/chat_members.py
diff --git a/pyrogram/client/types/chat_photo.py b/pyrogram/client/types/user_and_chats/chat_photo.py
similarity index 100%
rename from pyrogram/client/types/chat_photo.py
rename to pyrogram/client/types/user_and_chats/chat_photo.py
diff --git a/pyrogram/client/types/dialog.py b/pyrogram/client/types/user_and_chats/dialog.py
similarity index 100%
rename from pyrogram/client/types/dialog.py
rename to pyrogram/client/types/user_and_chats/dialog.py
diff --git a/pyrogram/client/types/dialogs.py b/pyrogram/client/types/user_and_chats/dialogs.py
similarity index 100%
rename from pyrogram/client/types/dialogs.py
rename to pyrogram/client/types/user_and_chats/dialogs.py
diff --git a/pyrogram/client/types/user.py b/pyrogram/client/types/user_and_chats/user.py
similarity index 100%
rename from pyrogram/client/types/user.py
rename to pyrogram/client/types/user_and_chats/user.py