diff --git a/spec/models/project_hook_spec.rb b/spec/models/hooks/project_hook_spec.rb
similarity index 100%
rename from spec/models/project_hook_spec.rb
rename to spec/models/hooks/project_hook_spec.rb
diff --git a/spec/models/service_hook_spec.rb b/spec/models/hooks/service_hook_spec.rb
similarity index 100%
rename from spec/models/service_hook_spec.rb
rename to spec/models/hooks/service_hook_spec.rb
diff --git a/spec/models/system_hook_spec.rb b/spec/models/hooks/system_hook_spec.rb
similarity index 100%
rename from spec/models/system_hook_spec.rb
rename to spec/models/hooks/system_hook_spec.rb
diff --git a/spec/models/web_hook_spec.rb b/spec/models/hooks/web_hook_spec.rb
similarity index 100%
rename from spec/models/web_hook_spec.rb
rename to spec/models/hooks/web_hook_spec.rb
diff --git a/spec/models/group_member_spec.rb b/spec/models/members/group_member_spec.rb
similarity index 100%
rename from spec/models/group_member_spec.rb
rename to spec/models/members/group_member_spec.rb
diff --git a/spec/models/project_member_spec.rb b/spec/models/members/project_member_spec.rb
similarity index 100%
rename from spec/models/project_member_spec.rb
rename to spec/models/members/project_member_spec.rb
diff --git a/spec/models/assembla_service_spec.rb b/spec/models/project_services/assembla_service_spec.rb
similarity index 100%
rename from spec/models/assembla_service_spec.rb
rename to spec/models/project_services/assembla_service_spec.rb
diff --git a/spec/models/buildbox_service_spec.rb b/spec/models/project_services/buildbox_service_spec.rb
similarity index 100%
rename from spec/models/buildbox_service_spec.rb
rename to spec/models/project_services/buildbox_service_spec.rb
diff --git a/spec/models/flowdock_service_spec.rb b/spec/models/project_services/flowdock_service_spec.rb
similarity index 100%
rename from spec/models/flowdock_service_spec.rb
rename to spec/models/project_services/flowdock_service_spec.rb
diff --git a/spec/models/gemnasium_service_spec.rb b/spec/models/project_services/gemnasium_service_spec.rb
similarity index 100%
rename from spec/models/gemnasium_service_spec.rb
rename to spec/models/project_services/gemnasium_service_spec.rb
diff --git a/spec/models/gitlab_ci_service_spec.rb b/spec/models/project_services/gitlab_ci_service_spec.rb
similarity index 100%
rename from spec/models/gitlab_ci_service_spec.rb
rename to spec/models/project_services/gitlab_ci_service_spec.rb
diff --git a/spec/models/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb
similarity index 100%
rename from spec/models/jira_service_spec.rb
rename to spec/models/project_services/jira_service_spec.rb
diff --git a/spec/models/pushover_service_spec.rb b/spec/models/project_services/pushover_service_spec.rb
similarity index 100%
rename from spec/models/pushover_service_spec.rb
rename to spec/models/project_services/pushover_service_spec.rb
diff --git a/spec/models/slack_message_spec.rb b/spec/models/project_services/slack_message_spec.rb
similarity index 100%
rename from spec/models/slack_message_spec.rb
rename to spec/models/project_services/slack_message_spec.rb
diff --git a/spec/models/slack_service_spec.rb b/spec/models/project_services/slack_service_spec.rb
similarity index 100%
rename from spec/models/slack_service_spec.rb
rename to spec/models/project_services/slack_service_spec.rb