diff --git a/README.md b/README.md
index 5083476..ba886df 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,6 @@ For existing swarms:
 - [310-core](ideas/310-core-team-proposal.md) (research)
 - [306-core-browser](ideas/306-core-browser.md) (research)
 - [304-core-chat](ideas/304-core-chat.md) (research)
-- [318-desktop](ideas/318-desktop-team-proposal.md) (research)
-- [319-wallet](ideas/319-wallet.md) (research)
+- [318-desktop](ideas/318-desktop.md) (research)
+- [319-wallet](ideas/319-core-wallet.md) (research)
 - Keycard missing
diff --git a/active/039-group-chat/README.md b/ideas/039-group-chat/README.md
similarity index 100%
rename from active/039-group-chat/README.md
rename to ideas/039-group-chat/README.md
diff --git a/active/039-group-chat/glossary.md b/ideas/039-group-chat/glossary.md
similarity index 100%
rename from active/039-group-chat/glossary.md
rename to ideas/039-group-chat/glossary.md
diff --git a/active/039-group-chat/requirements/req-1-blocking-menu.md b/ideas/039-group-chat/requirements/req-1-blocking-menu.md
similarity index 100%
rename from active/039-group-chat/requirements/req-1-blocking-menu.md
rename to ideas/039-group-chat/requirements/req-1-blocking-menu.md
diff --git a/active/039-group-chat/roles.md b/ideas/039-group-chat/roles.md
similarity index 100%
rename from active/039-group-chat/roles.md
rename to ideas/039-group-chat/roles.md
diff --git a/active/039-group-chat/user-stories/us-1-blocking-a-user.md b/ideas/039-group-chat/user-stories/us-1-blocking-a-user.md
similarity index 100%
rename from active/039-group-chat/user-stories/us-1-blocking-a-user.md
rename to ideas/039-group-chat/user-stories/us-1-blocking-a-user.md
diff --git a/active/039-group-chat/user-stories/us-2-reducing-spam.md b/ideas/039-group-chat/user-stories/us-2-reducing-spam.md
similarity index 100%
rename from active/039-group-chat/user-stories/us-2-reducing-spam.md
rename to ideas/039-group-chat/user-stories/us-2-reducing-spam.md
diff --git a/active/039-group-chat/user-stories/us-3-filter-unwanted-content.md b/ideas/039-group-chat/user-stories/us-3-filter-unwanted-content.md
similarity index 100%
rename from active/039-group-chat/user-stories/us-3-filter-unwanted-content.md
rename to ideas/039-group-chat/user-stories/us-3-filter-unwanted-content.md
diff --git a/active/039-group-chat/user-stories/us-4-advanced-filtering-with-smart-contracts.md b/ideas/039-group-chat/user-stories/us-4-advanced-filtering-with-smart-contracts.md
similarity index 100%
rename from active/039-group-chat/user-stories/us-4-advanced-filtering-with-smart-contracts.md
rename to ideas/039-group-chat/user-stories/us-4-advanced-filtering-with-smart-contracts.md
diff --git a/active/039-group-chat/user-stories/us-5-subscribe-to-moderation-providers.md b/ideas/039-group-chat/user-stories/us-5-subscribe-to-moderation-providers.md
similarity index 100%
rename from active/039-group-chat/user-stories/us-5-subscribe-to-moderation-providers.md
rename to ideas/039-group-chat/user-stories/us-5-subscribe-to-moderation-providers.md
diff --git a/171-whisper-miniseries.md b/ideas/171-whisper-miniseries.md
similarity index 100%
rename from 171-whisper-miniseries.md
rename to ideas/171-whisper-miniseries.md
diff --git a/173-documentation.md b/ideas/173-documentation.md
similarity index 100%
rename from 173-documentation.md
rename to ideas/173-documentation.md
diff --git a/ideas/310-core-team-proposal.md b/ideas/310-core.md
similarity index 99%
rename from ideas/310-core-team-proposal.md
rename to ideas/310-core.md
index 4176c6a..1b9a699 100644
--- a/ideas/310-core-team-proposal.md
+++ b/ideas/310-core.md
@@ -1,5 +1,5 @@
 ---
-id: #310-core-team
+id: #310-core
 title: Core Team
 status: research
 lead conributor: Igor
diff --git a/ideas/318-desktop-team-proposal.md b/ideas/318-desktop.md
similarity index 100%
rename from ideas/318-desktop-team-proposal.md
rename to ideas/318-desktop.md
diff --git a/ideas/319-wallet.md b/ideas/319-core-wallet.md
similarity index 100%
rename from ideas/319-wallet.md
rename to ideas/319-core-wallet.md