diff --git a/lib/dashbot/features/chat/services/actions/auto_fix_service.dart b/lib/dashbot/core/services/actions/auto_fix_service.dart
similarity index 99%
rename from lib/dashbot/features/chat/services/actions/auto_fix_service.dart
rename to lib/dashbot/core/services/actions/auto_fix_service.dart
index bb085853..10226ac7 100644
--- a/lib/dashbot/features/chat/services/actions/auto_fix_service.dart
+++ b/lib/dashbot/core/services/actions/auto_fix_service.dart
@@ -1,7 +1,7 @@
 import 'package:apidash_core/apidash_core.dart';
 import 'package:apidash/models/models.dart';
 
-import '../../models/chat_models.dart';
+import '../../../features/chat/models/chat_models.dart';
 import 'request_apply_service.dart';
 
 class AutoFixService {
diff --git a/lib/dashbot/features/chat/services/actions/request_apply_service.dart b/lib/dashbot/core/services/actions/request_apply_service.dart
similarity index 99%
rename from lib/dashbot/features/chat/services/actions/request_apply_service.dart
rename to lib/dashbot/core/services/actions/request_apply_service.dart
index 1390a6cb..5ee56021 100644
--- a/lib/dashbot/features/chat/services/actions/request_apply_service.dart
+++ b/lib/dashbot/core/services/actions/request_apply_service.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 
 import 'package:apidash_core/apidash_core.dart';
 
-import '../../models/chat_models.dart';
+import '../../../features/chat/models/chat_models.dart';
 import '../base/url_env_service.dart';
 
 class ApplyResult {
diff --git a/lib/dashbot/features/chat/services/agent/prompt_builder.dart b/lib/dashbot/core/services/agent/prompt_builder.dart
similarity index 98%
rename from lib/dashbot/features/chat/services/agent/prompt_builder.dart
rename to lib/dashbot/core/services/agent/prompt_builder.dart
index bee7d217..4107fdc3 100644
--- a/lib/dashbot/features/chat/services/agent/prompt_builder.dart
+++ b/lib/dashbot/core/services/agent/prompt_builder.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/models/models.dart';
 import 'package:apidash/dashbot/core/constants/dashbot_prompts.dart' as dash;
 
-import '../../models/chat_models.dart';
+import '../../../features/chat/models/chat_models.dart';
 
 class PromptBuilder {
   String buildSystemPrompt(
diff --git a/lib/dashbot/features/chat/services/base/url_env_service.dart b/lib/dashbot/core/services/base/url_env_service.dart
similarity index 100%
rename from lib/dashbot/features/chat/services/base/url_env_service.dart
rename to lib/dashbot/core/services/base/url_env_service.dart
diff --git a/lib/dashbot/features/chat/providers/service_providers.dart b/lib/dashbot/features/chat/providers/service_providers.dart
index 7cdac0ae..c8889749 100644
--- a/lib/dashbot/features/chat/providers/service_providers.dart
+++ b/lib/dashbot/features/chat/providers/service_providers.dart
@@ -1,9 +1,9 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import '../services/agent/prompt_builder.dart';
-import '../services/base/url_env_service.dart';
-import '../services/actions/auto_fix_service.dart';
-import '../services/actions/request_apply_service.dart';
+import '../../../core/services/agent/prompt_builder.dart';
+import '../../../core/services/base/url_env_service.dart';
+import '../../../core/services/actions/auto_fix_service.dart';
+import '../../../core/services/actions/request_apply_service.dart';
 import '../../../../providers/providers.dart';
 import 'package:apidash_core/apidash_core.dart';