diff --git a/augur/tasks/github/__init__.py b/augur/tasks/github/__init__.py
index 29823eafe5..63d68da41b 100644
--- a/augur/tasks/github/__init__.py
+++ b/augur/tasks/github/__init__.py
@@ -1,7 +1,7 @@
-from augur.tasks.github.contributors.tasks import *
-from augur.tasks.github.events.tasks import *
-from augur.tasks.github.issues.tasks import *
-from augur.tasks.github.messages.tasks import *
+from augur.tasks.github.contributors import *
+from augur.tasks.github.events import *
+from augur.tasks.github.issues import *
+from augur.tasks.github.messages import *
 from augur.tasks.github.pull_requests.tasks import *
 from augur.tasks.github.repo_info.tasks import *
 from augur.tasks.github.releases.tasks import *
diff --git a/augur/tasks/github/contributors/tasks.py b/augur/tasks/github/contributors.py
similarity index 100%
rename from augur/tasks/github/contributors/tasks.py
rename to augur/tasks/github/contributors.py
diff --git a/augur/tasks/github/contributors/__init__.py b/augur/tasks/github/contributors/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/augur/tasks/github/contributors/core.py b/augur/tasks/github/contributors/core.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/augur/tasks/github/events/tasks.py b/augur/tasks/github/events.py
similarity index 100%
rename from augur/tasks/github/events/tasks.py
rename to augur/tasks/github/events.py
diff --git a/augur/tasks/github/events/__init__.py b/augur/tasks/github/events/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/augur/tasks/github/events/core.py b/augur/tasks/github/events/core.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/augur/tasks/github/issues/tasks.py b/augur/tasks/github/issues.py
similarity index 99%
rename from augur/tasks/github/issues/tasks.py
rename to augur/tasks/github/issues.py
index 2b0316fb2f..ae1fb07cd9 100644
--- a/augur/tasks/github/issues/tasks.py
+++ b/augur/tasks/github/issues.py
@@ -65,7 +65,7 @@ def retrieve_all_issue_data(repo_git, logger, key_auth, since) -> None:
     url = f"https://api.github.com/repos/{owner}/{repo}/issues?state=all"
 
     if since:
-        url += since.isoformat()
+        url += f"&since={since.isoformat()}"
 
     github_data_access = GithubDataAccess(key_auth, logger)
 
diff --git a/augur/tasks/github/issues/__init__.py b/augur/tasks/github/issues/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/augur/tasks/github/issues/core.py b/augur/tasks/github/issues/core.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/augur/tasks/github/messages/tasks.py b/augur/tasks/github/messages.py
similarity index 100%
rename from augur/tasks/github/messages/tasks.py
rename to augur/tasks/github/messages.py
diff --git a/augur/tasks/github/messages/__init__.py b/augur/tasks/github/messages/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/augur/tasks/github/messages/core.py b/augur/tasks/github/messages/core.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/augur/tasks/github/pull_requests/tasks.py b/augur/tasks/github/pull_requests/tasks.py
index a5311de079..dd31f726f4 100644
--- a/augur/tasks/github/pull_requests/tasks.py
+++ b/augur/tasks/github/pull_requests/tasks.py
@@ -14,7 +14,7 @@
 from augur.tasks.github.util.github_random_key_auth import GithubRandomKeyAuth
 from augur.application.db.lib import get_session, get_repo_by_repo_git, bulk_insert_dicts, get_pull_request_reviews_by_repo_id
 from augur.application.db.util import execute_session_query
-from ..messages.tasks import process_github_comment_contributors
+from ..messages import process_github_comment_contributors
 from augur.application.db.lib import get_secondary_data_last_collected, get_updated_prs, get_core_data_last_collected
 
 from typing import Generator, List, Dict
diff --git a/augur/tasks/github/traffic/tasks.py b/augur/tasks/github/traffic.py
similarity index 100%
rename from augur/tasks/github/traffic/tasks.py
rename to augur/tasks/github/traffic.py
diff --git a/augur/tasks/github/traffic/__init__.py b/augur/tasks/github/traffic/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/augur/tasks/github/traffic/core.py b/augur/tasks/github/traffic/core.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/augur/tasks/init/celery_app.py b/augur/tasks/init/celery_app.py
index e57fb674d2..da97751db9 100644
--- a/augur/tasks/init/celery_app.py
+++ b/augur/tasks/init/celery_app.py
@@ -26,18 +26,18 @@
                 'augur.tasks.data_analysis',
                 'augur.tasks.util.collection_util']
 
-github_tasks = ['augur.tasks.github.contributors.tasks',
-                'augur.tasks.github.issues.tasks',
+github_tasks = ['augur.tasks.github.contributors',
+                'augur.tasks.github.issues',
                 'augur.tasks.github.pull_requests.tasks',
-                'augur.tasks.github.events.tasks',
-                'augur.tasks.github.messages.tasks',
+                'augur.tasks.github.events',
+                'augur.tasks.github.messages',
                 'augur.tasks.github.facade_github.tasks',
                 'augur.tasks.github.releases.tasks',
                 'augur.tasks.github.repo_info.tasks',
                 'augur.tasks.github.detect_move.tasks',
                 'augur.tasks.github.pull_requests.files_model.tasks',
                 'augur.tasks.github.pull_requests.commits_model.tasks',
-                'augur.tasks.github.traffic.tasks']
+                'augur.tasks.github.traffic']
 
 gitlab_tasks = ['augur.tasks.gitlab.merge_request_task',
                 'augur.tasks.gitlab.issues_task',
diff --git a/augur/tasks/start_tasks.py b/augur/tasks/start_tasks.py
index 0572d0a1d2..001a2d4f91 100644
--- a/augur/tasks/start_tasks.py
+++ b/augur/tasks/start_tasks.py
@@ -15,7 +15,7 @@
 from augur.tasks.github.pull_requests.files_model.tasks import process_pull_request_files
 from augur.tasks.github.pull_requests.commits_model.tasks import process_pull_request_commits
 from augur.tasks.git.dependency_tasks.tasks import process_ossf_dependency_metrics
-from augur.tasks.github.traffic.tasks import collect_github_repo_clones_data
+from augur.tasks.github.traffic import collect_github_repo_clones_data
 from augur.tasks.gitlab.merge_request_task import collect_gitlab_merge_requests, collect_merge_request_metadata, collect_merge_request_commits, collect_merge_request_files, collect_merge_request_comments
 from augur.tasks.gitlab.issues_task import collect_gitlab_issues, collect_gitlab_issue_comments
 from augur.tasks.gitlab.events_task import collect_gitlab_issue_events, collect_gitlab_merge_request_events