diff --git a/src/syng_im/android/core.cljs b/src/syng_im/android/core.cljs
index 73f2fcfcc7..38b031cf7d 100644
--- a/src/syng_im/android/core.cljs
+++ b/src/syng_im/android/core.cljs
@@ -15,7 +15,7 @@
             [syng-im.components.chats.new-group :refer [new-group]]
             [syng-im.components.chat.new-participants :refer [new-participants]]
             [syng-im.components.chat.remove-participants :refer [remove-participants]]
-            [syng-im.components.group-settings :refer [group-settings]]
+            [syng-im.group-settings.group-settings :refer [group-settings]]
             [syng-im.components.profile :refer [profile my-profile]]
             [syng-im.utils.logging :as log]
             [syng-im.utils.utils :refer [toast]]
diff --git a/src/syng_im/components/group_settings.cljs b/src/syng_im/group_settings/group_settings.cljs
similarity index 92%
rename from src/syng_im/components/group_settings.cljs
rename to src/syng_im/group_settings/group_settings.cljs
index 2181daa471..18f0d0f166 100644
--- a/src/syng_im/components/group_settings.cljs
+++ b/src/syng_im/group_settings/group_settings.cljs
@@ -1,4 +1,4 @@
-(ns syng-im.components.group-settings
+(ns syng-im.group-settings.group-settings
   (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]]
             [syng-im.resources :as res]
             [syng-im.components.react :refer [view
@@ -11,9 +11,9 @@
             [syng-im.components.realm :refer [list-view]]
             [syng-im.components.styles :refer [color-purple
                                                text2-color]]
-            [syng-im.components.group-settings-styles :as st]
+            [syng-im.group-settings.styles.group-settings :as st]
             [syng-im.utils.listview :refer [to-realm-datasource]]
-            [syng-im.components.group-settings-member :refer [contact-inner-view]]
+            [syng-im.group-settings.views.member :refer [contact-inner-view]]
             [reagent.core :as r]))
 
 (defn set-group-settings-name [chat-name]
diff --git a/src/syng_im/components/group_settings_styles.cljs b/src/syng_im/group_settings/styles/group_settings.cljs
similarity index 97%
rename from src/syng_im/components/group_settings_styles.cljs
rename to src/syng_im/group_settings/styles/group_settings.cljs
index 498c212ed8..855c5ca92d 100644
--- a/src/syng_im/components/group_settings_styles.cljs
+++ b/src/syng_im/group_settings/styles/group_settings.cljs
@@ -1,4 +1,4 @@
-(ns syng-im.components.group-settings-styles
+(ns syng-im.group-settings.styles.group-settings
   (:require [syng-im.components.styles :refer [font
                                                title-font
                                                color-white
diff --git a/src/syng_im/components/group_settings_member_styles.cljs b/src/syng_im/group_settings/styles/member.cljs
similarity index 87%
rename from src/syng_im/components/group_settings_member_styles.cljs
rename to src/syng_im/group_settings/styles/member.cljs
index 122802f4f3..a25ea0cd5a 100644
--- a/src/syng_im/components/group_settings_member_styles.cljs
+++ b/src/syng_im/group_settings/styles/member.cljs
@@ -1,4 +1,4 @@
-(ns syng-im.components.group-settings-member-styles
+(ns syng-im.group-settings.styles.member
   (:require [syng-im.components.styles :refer [font
                                                title-font
                                                text1-color
@@ -6,17 +6,6 @@
                                                color-white
                                                online-color]]))
 
-(def search-icon
-  {:width  17
-   :height 17})
-
-(def contacts-list-container
-  {:flex            1
-   :backgroundColor :white})
-
-(def contacts-list
-  {:backgroundColor :white})
-
 (def contact-photo-container
   {:borderRadius 50})
 
diff --git a/src/syng_im/components/group_settings_member.cljs b/src/syng_im/group_settings/views/member.cljs
similarity index 91%
rename from src/syng_im/components/group_settings_member.cljs
rename to src/syng_im/group_settings/views/member.cljs
index 892de6c485..ab1ff9825c 100644
--- a/src/syng_im/components/group_settings_member.cljs
+++ b/src/syng_im/group_settings/views/member.cljs
@@ -1,8 +1,8 @@
-(ns syng-im.components.group-settings-member
+(ns syng-im.group-settings.views.member
   (:require [clojure.string :as s]
             [syng-im.components.react :refer [view image text icon touchable-highlight]]
             [syng-im.resources :as res]
-            [syng-im.components.group-settings-member-styles :as st]))
+            [syng-im.group-settings.styles.member :as st]))
 
 (defn contact-photo [{:keys [photo-path]}]
   [view st/contact-photo-container