diff --git a/web/src/components/features/Buttons/SaveDashboardToCollectionButton.tsx b/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx
similarity index 100%
rename from web/src/components/features/Buttons/SaveDashboardToCollectionButton.tsx
rename to web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx
diff --git a/web/src/components/features/Buttons/SaveMetricToCollectionButton.tsx b/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx
similarity index 100%
rename from web/src/components/features/Buttons/SaveMetricToCollectionButton.tsx
rename to web/src/components/features/buttons/SaveMetricToCollectionButton.tsx
diff --git a/web/src/components/features/Buttons/SaveMetricToDashboardButton.tsx b/web/src/components/features/buttons/SaveMetricToDashboardButton.tsx
similarity index 100%
rename from web/src/components/features/Buttons/SaveMetricToDashboardButton.tsx
rename to web/src/components/features/buttons/SaveMetricToDashboardButton.tsx
diff --git a/web/src/components/features/Buttons/ShareButton.tsx b/web/src/components/features/buttons/ShareButton.tsx
similarity index 100%
rename from web/src/components/features/Buttons/ShareButton.tsx
rename to web/src/components/features/buttons/ShareButton.tsx
diff --git a/web/src/components/features/Buttons/ShareDashboardButton.tsx b/web/src/components/features/buttons/ShareDashboardButton.tsx
similarity index 100%
rename from web/src/components/features/Buttons/ShareDashboardButton.tsx
rename to web/src/components/features/buttons/ShareDashboardButton.tsx
diff --git a/web/src/components/features/Buttons/ShareMetricButton.tsx b/web/src/components/features/buttons/ShareMetricButton.tsx
similarity index 100%
rename from web/src/components/features/Buttons/ShareMetricButton.tsx
rename to web/src/components/features/buttons/ShareMetricButton.tsx
diff --git a/web/src/components/features/Dropdowns/SaveToCollectionsDropdown.tsx b/web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx
similarity index 100%
rename from web/src/components/features/Dropdowns/SaveToCollectionsDropdown.tsx
rename to web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx
diff --git a/web/src/components/features/Dropdowns/SaveToDashboardDropdown.tsx b/web/src/components/features/dropdowns/SaveToDashboardDropdown.tsx
similarity index 100%
rename from web/src/components/features/Dropdowns/SaveToDashboardDropdown.tsx
rename to web/src/components/features/dropdowns/SaveToDashboardDropdown.tsx
diff --git a/web/src/components/features/Lists/FavoriteStar.tsx b/web/src/components/features/lists/FavoriteStar.tsx
similarity index 100%
rename from web/src/components/features/Lists/FavoriteStar.tsx
rename to web/src/components/features/lists/FavoriteStar.tsx
diff --git a/web/src/components/features/Lists/ListUserItem.tsx b/web/src/components/features/lists/ListUserItem.tsx
similarity index 100%
rename from web/src/components/features/Lists/ListUserItem.tsx
rename to web/src/components/features/lists/ListUserItem.tsx
diff --git a/web/src/components/features/Lists/StatusBadgeIndicator.tsx b/web/src/components/features/lists/StatusBadgeIndicator.tsx
similarity index 100%
rename from web/src/components/features/Lists/StatusBadgeIndicator.tsx
rename to web/src/components/features/lists/StatusBadgeIndicator.tsx
diff --git a/web/src/components/features/Lists/index.ts b/web/src/components/features/lists/index.ts
similarity index 100%
rename from web/src/components/features/Lists/index.ts
rename to web/src/components/features/lists/index.ts
diff --git a/web/src/components/features/Modals/AddTypeModal.tsx b/web/src/components/features/modals/AddTypeModal.tsx
similarity index 100%
rename from web/src/components/features/Modals/AddTypeModal.tsx
rename to web/src/components/features/modals/AddTypeModal.tsx
diff --git a/web/src/components/features/Modals/InvitePeopleModal.tsx b/web/src/components/features/modals/InvitePeopleModal.tsx
similarity index 100%
rename from web/src/components/features/Modals/InvitePeopleModal.tsx
rename to web/src/components/features/modals/InvitePeopleModal.tsx
diff --git a/web/src/components/features/Modals/NewCollectionModal.tsx b/web/src/components/features/modals/NewCollectionModal.tsx
similarity index 100%
rename from web/src/components/features/Modals/NewCollectionModal.tsx
rename to web/src/components/features/modals/NewCollectionModal.tsx
diff --git a/web/src/components/features/Modals/NewDatasetModal.tsx b/web/src/components/features/modals/NewDatasetModal.tsx
similarity index 100%
rename from web/src/components/features/Modals/NewDatasetModal.tsx
rename to web/src/components/features/modals/NewDatasetModal.tsx
diff --git a/web/src/components/features/Modals/NewTeamModal.tsx b/web/src/components/features/modals/NewTeamModal.tsx
similarity index 100%
rename from web/src/components/features/Modals/NewTeamModal.tsx
rename to web/src/components/features/modals/NewTeamModal.tsx
diff --git a/web/src/components/features/Modals/NewTermModal.tsx b/web/src/components/features/modals/NewTermModal.tsx
similarity index 100%
rename from web/src/components/features/Modals/NewTermModal.tsx
rename to web/src/components/features/modals/NewTermModal.tsx
diff --git a/web/src/components/features/Modals/SupportModal.tsx b/web/src/components/features/modals/SupportModal.tsx
similarity index 100%
rename from web/src/components/features/Modals/SupportModal.tsx
rename to web/src/components/features/modals/SupportModal.tsx
diff --git a/web/src/components/features/Popups/SaveResetFilePopup.tsx b/web/src/components/features/popups/SaveResetFilePopup.tsx
similarity index 100%
rename from web/src/components/features/Popups/SaveResetFilePopup.tsx
rename to web/src/components/features/popups/SaveResetFilePopup.tsx