diff --git a/extensions/skyportal/static/js/components/TelescopeMapDashboard.jsx b/extensions/skyportal/static/js/components/telescope/TelescopeMapDashboard.jsx
similarity index 97%
rename from extensions/skyportal/static/js/components/TelescopeMapDashboard.jsx
rename to extensions/skyportal/static/js/components/telescope/TelescopeMapDashboard.jsx
index d9498c9..ffe4429 100644
--- a/extensions/skyportal/static/js/components/TelescopeMapDashboard.jsx
+++ b/extensions/skyportal/static/js/components/telescope/TelescopeMapDashboard.jsx
@@ -7,7 +7,7 @@ import { Tooltip } from "@mui/material";
 import HelpOutlineOutlinedIcon from "@mui/icons-material/HelpOutlineOutlined";
 
 // lazy import the TelescopeMap component
-const TelescopeMap = lazy(() => import("./telescope/TelescopeMap"));
+const TelescopeMap = lazy(() => import("./TelescopeMap"));
 
 const useStyles = makeStyles((theme) => ({
   help: {
diff --git a/extensions/skyportal/static/js/components/DashboardGrandma.jsx.template b/extensions/skyportal/static/js/components/templates/DashboardGrandma.jsx.template
similarity index 92%
rename from extensions/skyportal/static/js/components/DashboardGrandma.jsx.template
rename to extensions/skyportal/static/js/components/templates/DashboardGrandma.jsx.template
index 41c4088..0f1af55 100644
--- a/extensions/skyportal/static/js/components/DashboardGrandma.jsx.template
+++ b/extensions/skyportal/static/js/components/templates/DashboardGrandma.jsx.template
@@ -16,15 +16,14 @@ import convertLength from "convert-css-length";
 
 import * as profileActions from "../ducks/profile";
 
-import RecentSources from "./RecentSources";
-import GroupList from "./GroupList";
-import NewsFeed from "./NewsFeed";
-import TopSources from "./TopSources";
-import RecentGcnEvents from "./RecentGcnEvents";
-import SourceCounts from "./SourceCounts";
-import WeatherWidget from "./WeatherWidget";
-import NewSource from "./NewSource";
-import TelescopeMapDashboard from "./TelescopeMapDashboard";
+import RecentSources from "../RecentSources";
+import GroupList from "../group/GroupList";
+import NewsFeed from "../NewsFeed";
+import TopSources from "../TopSources";
+import RecentGcnEvents from "../RecentGcnEvents";
+import SourceCounts from "../source/SourceCounts";
+import WeatherWidget from "../WeatherWidget";
+import TelescopeMapDashboard from "../telescope/TelescopeMapDashboard";
 
 const ResponsiveGridLayout = WidthProvider(Responsive);
 
diff --git a/icare.yaml.defaults b/icare.yaml.defaults
index a702da1..c0494d1 100644
--- a/icare.yaml.defaults
+++ b/icare.yaml.defaults
@@ -7,7 +7,7 @@ app:
 
   routes:
     - path: "/"
-      component: DashboardGrandma
+      component: templates/DashboardGrandma
       exact: True
     - path: "/source/:id"
       component: source/Source
@@ -108,10 +108,6 @@ app:
           icon: Home
           url: /
 
-        # - name: Dashboard Grandma
-        #  icon: ElderlyWoman
-        #  url: /dashboardGrandma
-
         - name: GW/GRB/Neutrino
           icon: SettingsInputAntenna
           url: /gcn_events
@@ -213,33 +209,6 @@ app:
           url: /user_management
 
   dashboard_grandma_widgets:
-    # This section describes the specific widgets shown on the Home Page and how
-    # they are laid out by default on the grid of the page.
-    #
-    # The name of section should be the same as the widget's React component.
-    #
-    # The props property should be a set of properties to be passed on to the
-    # underlying React component for the widget. You may run into cases in which
-    # you must pass a more complex, dynamic property (perhaps fetched from the
-    # application redux store). Since you can not know that in the time of the
-    # configuration writing, such properties should be directly coded into the
-    # HomePage.jsx.template file (see the GroupList widget for an example)
-    #
-    # By default, any widget listed here is shown on the Home Page. However, you
-    # can give a widget the property "show: false" to turn off rendering of the
-    # widget.
-    #
-    # The resizable property determines whether the user is able to resize the
-    # widget after it has been rendered based on default layouts.
-    #
-    # Finally, the layouts property provides an array of default sizes/locations
-    # for each screen width breakpoint for the given widget. Layout arrays are
-    # given in the order [x, y, width, height], in units of grid columns/rows.
-    # For example, a layout array of [1, 2, 3, 4] will render a widget 3 grid
-    # columns in width, 4 grid rows in height, and have its upper-left corner at
-    # the column 1 (zero-indexed) and row 2. Note that each row is by default
-    # 150px in height. The row height can be altered in the homepage_grid
-    # section above (as well as other grid characteristics).
     RecentGcnEvents:
       resizeable: true
       minW: 2