diff --git a/lib/code_work_spawner.dart b/lib/code_work_spawner.dart
index 9c44c5a..c67d03a 100644
--- a/lib/code_work_spawner.dart
+++ b/lib/code_work_spawner.dart
@@ -1,8 +1,8 @@
 export 'src/comment_templates.dart';
 export 'src/config.dart';
 export 'src/database.dart';
+export 'src/issue_event_source/base.dart';
 export 'src/issue_tracker_client.dart';
-export 'src/issue_event_source.dart';
 export 'src/issue_assistant_app.dart';
 export 'src/notifier.dart';
 export 'src/workspace_manager.dart';
diff --git a/lib/src/issue_assistant_app.dart b/lib/src/issue_assistant_app.dart
index 6669af1..628afbc 100644
--- a/lib/src/issue_assistant_app.dart
+++ b/lib/src/issue_assistant_app.dart
@@ -7,10 +7,10 @@ import 'package:logging/logging.dart';
 import 'cli_responder.dart';
 import 'config.dart';
 import 'database.dart';
-import 'issue_event_source.dart';
-import 'issue_event_source_gitea_gosmee.dart';
-import 'issue_event_source_github_gosmee.dart';
-import 'issue_event_source_github_webhook_forward.dart';
+import 'issue_event_source/base.dart';
+import 'issue_event_source/gitea_gosmee.dart';
+import 'issue_event_source/github_gosmee.dart';
+import 'issue_event_source/github_webhook_forward.dart';
 import 'issue_tracker_client.dart';
 import 'notifier.dart';
 import 'workspace_manager.dart';
diff --git a/lib/src/issue_event_source.dart b/lib/src/issue_event_source/base.dart
similarity index 99%
rename from lib/src/issue_event_source.dart
rename to lib/src/issue_event_source/base.dart
index 7baa84d..d228365 100644
--- a/lib/src/issue_event_source.dart
+++ b/lib/src/issue_event_source/base.dart
@@ -4,9 +4,9 @@ import 'dart:io';
 import 'package:github/github.dart';
 import 'package:logging/logging.dart';
 
-import 'config.dart';
-import 'database.dart';
-import 'issue_tracker_client.dart';
+import '../config.dart';
+import '../database.dart';
+import '../issue_tracker_client.dart';
 
 typedef IssueEventBatchHandler = Future<void> Function(IssueEventBatch batch);
 
diff --git a/lib/src/issue_event_source_gitea_gosmee.dart b/lib/src/issue_event_source/gitea_gosmee.dart
similarity index 99%
rename from lib/src/issue_event_source_gitea_gosmee.dart
rename to lib/src/issue_event_source/gitea_gosmee.dart
index 7408f6f..b82783b 100644
--- a/lib/src/issue_event_source_gitea_gosmee.dart
+++ b/lib/src/issue_event_source/gitea_gosmee.dart
@@ -5,9 +5,9 @@ import 'dart:io';
 import 'package:github/github.dart';
 import 'package:logging/logging.dart';
 
-import 'config.dart';
-import 'issue_event_source.dart';
-import 'issue_tracker_client.dart';
+import '../config.dart';
+import '../issue_tracker_client.dart';
+import 'base.dart';
 
 class GiteaGosmeeIssueEventSource implements IssueEventSource {
   GiteaGosmeeIssueEventSource({
diff --git a/lib/src/issue_event_source_github_gosmee.dart b/lib/src/issue_event_source/github_gosmee.dart
similarity index 99%
rename from lib/src/issue_event_source_github_gosmee.dart
rename to lib/src/issue_event_source/github_gosmee.dart
index 6aa007b..59ff444 100644
--- a/lib/src/issue_event_source_github_gosmee.dart
+++ b/lib/src/issue_event_source/github_gosmee.dart
@@ -5,9 +5,9 @@ import 'dart:io';
 import 'package:github/github.dart';
 import 'package:logging/logging.dart';
 
-import 'config.dart';
-import 'issue_event_source.dart';
-import 'issue_tracker_client.dart';
+import '../config.dart';
+import '../issue_tracker_client.dart';
+import 'base.dart';
 
 class GitHubGosmeeIssueEventSource implements IssueEventSource {
   GitHubGosmeeIssueEventSource({
diff --git a/lib/src/issue_event_source_github_webhook_forward.dart b/lib/src/issue_event_source/github_webhook_forward.dart
similarity index 98%
rename from lib/src/issue_event_source_github_webhook_forward.dart
rename to lib/src/issue_event_source/github_webhook_forward.dart
index bfe39d1..a1347c3 100644
--- a/lib/src/issue_event_source_github_webhook_forward.dart
+++ b/lib/src/issue_event_source/github_webhook_forward.dart
@@ -4,9 +4,9 @@ import 'dart:io';
 
 import 'package:logging/logging.dart';
 
-import 'config.dart';
-import 'issue_event_source.dart';
-import 'issue_tracker_client.dart';
+import '../config.dart';
+import '../issue_tracker_client.dart';
+import 'base.dart';
 
 class GitHubWebhookForwardIssueEventSource implements IssueEventSource {
   GitHubWebhookForwardIssueEventSource({