diff --git a/app/styles/main.scss b/app/styles/main.scss
index 782569fc..bebde87a 100755
--- a/app/styles/main.scss
+++ b/app/styles/main.scss
@@ -38,12 +38,8 @@ $prefix-for-spec:      true;
 //Modules
 @import 'modules/nav';
 @import 'modules/projects-nav';
-@import 'modules/filters';
 @import 'modules/lightbox';
 @import 'modules/kanban-table';
-@import 'modules/search-filter';
-@import 'modules/search-result-table';
-@import 'modules/search-in';
 @import 'modules/issues-table';
 @import 'modules/colors-table';
 @import 'modules/category-config';
@@ -52,7 +48,13 @@ $prefix-for-spec:      true;
 @import 'modules/comment-activity';
 @import 'modules/activity';
 
+//Search
+@import 'modules/search/search-filter';
+@import 'modules/search/search-result-table';
+@import 'modules/search/search-in';
+
 //Filters
+@import 'modules/filters/filters';
 @import 'modules/filters/list-filters';
 @import 'modules/filters/filter-tags';
 
diff --git a/app/styles/modules/filters.scss b/app/styles/modules/filters/filters.scss
similarity index 100%
rename from app/styles/modules/filters.scss
rename to app/styles/modules/filters/filters.scss
diff --git a/app/styles/modules/search-filter.scss b/app/styles/modules/search/search-filter.scss
similarity index 100%
rename from app/styles/modules/search-filter.scss
rename to app/styles/modules/search/search-filter.scss
diff --git a/app/styles/modules/search-in.scss b/app/styles/modules/search/search-in.scss
similarity index 100%
rename from app/styles/modules/search-in.scss
rename to app/styles/modules/search/search-in.scss
diff --git a/app/styles/modules/search-result-table.scss b/app/styles/modules/search/search-result-table.scss
similarity index 100%
rename from app/styles/modules/search-result-table.scss
rename to app/styles/modules/search/search-result-table.scss