diff --git a/ConversationsClassic/View/Screens/Create/AddAccountScreen.swift b/ConversationsClassic/View/Screens/AddAccountScreen.swift
similarity index 100%
rename from ConversationsClassic/View/Screens/Create/AddAccountScreen.swift
rename to ConversationsClassic/View/Screens/AddAccountScreen.swift
diff --git a/ConversationsClassic/View/Screens/ChatsListScreen.swift b/ConversationsClassic/View/Screens/Chats/ChatsListScreen.swift
similarity index 100%
rename from ConversationsClassic/View/Screens/ChatsListScreen.swift
rename to ConversationsClassic/View/Screens/Chats/ChatsListScreen.swift
diff --git a/ConversationsClassic/View/Screens/Create/CreateConversationMainScreen.swift b/ConversationsClassic/View/Screens/Chats/CreateConversationMainScreen.swift
similarity index 100%
rename from ConversationsClassic/View/Screens/Create/CreateConversationMainScreen.swift
rename to ConversationsClassic/View/Screens/Chats/CreateConversationMainScreen.swift
diff --git a/ConversationsClassic/View/Screens/Create/AddContactOrChannelScreen.swift b/ConversationsClassic/View/Screens/Contacts/AddContactOrChannelScreen.swift
similarity index 100%
rename from ConversationsClassic/View/Screens/Create/AddContactOrChannelScreen.swift
rename to ConversationsClassic/View/Screens/Contacts/AddContactOrChannelScreen.swift
diff --git a/ConversationsClassic/View/Screens/ContactsScreen.swift b/ConversationsClassic/View/Screens/Contacts/ContactsScreen.swift
similarity index 100%
rename from ConversationsClassic/View/Screens/ContactsScreen.swift
rename to ConversationsClassic/View/Screens/Contacts/ContactsScreen.swift
diff --git a/ConversationsClassic/View/Screens/SettingsScreen.swift b/ConversationsClassic/View/Screens/Settings/SettingsScreen.swift
similarity index 100%
rename from ConversationsClassic/View/Screens/SettingsScreen.swift
rename to ConversationsClassic/View/Screens/Settings/SettingsScreen.swift