refactor: all imports to come from ui & services

app/src/routes/(course-reader)/+layout.svelte

@@ -15,7 +15,7 @@
   import PageTransition from "$lib/ui/PageTransition.svelte";
   import { getKeys } from "$lib/environment";
   import { analyticsService } from "$lib/services/analytics";
-  import { initServices } from "$lib/tutors-startup";
+  import { initServices } from "$lib/services/tutors-startup";
   import type { RealtimeChannel } from "@supabase/supabase-js";
   import {
     setupPresence,

app/src/routes/(course-reader)/course/[courseid]/+page.svelte

@@ -2,7 +2,7 @@
   import { onMount } from "svelte";
   import { goto } from "$app/navigation";
   import { analyticsService } from "$lib/services/analytics";
-  import { initFirebase } from "$lib/utils/firebase";
+  import { initFirebase } from "$lib/services/utils/firebase";
   import { getKeys } from "$lib/environment";
   import TopDeck from "$lib/ui/legacy/Organisms/CardDeck/TopDeck.svelte";
 

app/src/routes/(course-reader)/course/[courseid]/+page.ts

@@ -1,5 +1,5 @@
 import { courseService } from "$lib/services/course";
-import type { Course } from "$lib/models/course";
+import type { Course } from "$lib/services/models/course";
 import { currentLo } from "$lib/stores";
 
 export const ssr = false;

app/src/routes/(course-reader)/live/[courseid]/+page.svelte

@@ -3,7 +3,7 @@
   import type { PageData } from "./$types";
   import { toastStore, type ToastSettings } from "@skeletonlabs/skeleton";
   import { onMount } from "svelte";
-  import type { StudentLoEvent } from "$lib/types/metrics";
+  import type { StudentLoEvent } from "$lib/services/types/metrics";
 
   export let data: PageData;
 

app/src/routes/(course-reader)/live/[courseid]/+page.ts

@@ -1,8 +1,8 @@
 import type { PageLoad } from "./$types";
 import { getKeys } from "$lib/environment";
-import { initFirebase } from "$lib/utils/firebase";
+import { initFirebase } from "$lib/services/utils/firebase";
 import { courseService } from "$lib/services/course";
-import type { Course } from "$lib/models/course";
+import type { Course } from "$lib/services/models/course";
 import { currentLo } from "$lib/stores";
 
 export const load: PageLoad = async ({ params, fetch }) => {

app/src/routes/(course-reader)/search/[courseid]/+page.svelte

@@ -1,12 +1,12 @@
 <script lang="ts">
   import { onMount } from "svelte";
-  import type { ResultType } from "$lib/utils/search";
-  import { isValid, searchHits } from "$lib/utils/search";
-  import type { Lo } from "$lib/types/lo";
-  import type { Course } from "$lib/models/course";
+  import type { ResultType } from "$lib/services/utils/search";
+  import { isValid, searchHits } from "$lib/services/utils/search";
+  import type { Lo } from "$lib/services/types/lo";
+  import type { Course } from "$lib/services/models/course";
   import { currentLo } from "$lib/stores";
-  import { allLos } from "$lib/utils/lo";
-  import { convertMdToHtml } from "$lib/utils/markdown";
+  import { allLos } from "$lib/services/utils/lo";
+  import { convertMdToHtml } from "$lib/services/utils/markdown";
 
   export let data: PageData;
 

app/src/routes/(course-reader)/search/[courseid]/+page.ts

@@ -1,6 +1,6 @@
 import type { PageLoad } from "./$types";
 import { courseService } from "$lib/services/course";
-import type { Course } from "$lib/models/course";
+import type { Course } from "$lib/services/models/course";
 import { currentLo } from "$lib/stores";
 
 export const ssr = false;

app/src/routes/(home)/+page.svelte

@@ -1,9 +1,9 @@
 <script lang="ts">
   import { modeCurrent } from "@skeletonlabs/skeleton";
   import "iconify-icon";
-  import DeveloperExperience from "$lib/home/DeveloperExperience.svelte";
-  import EducatorExperience from "$lib/home/EducatorExperience.svelte";
-  import LearnerExperience from "$lib/home/LearnerExperience.svelte";
+  import DeveloperExperience from "$lib/ui/home/DeveloperExperience.svelte";
+  import EducatorExperience from "$lib/ui/home/EducatorExperience.svelte";
+  import LearnerExperience from "$lib/ui/home/LearnerExperience.svelte";
   import { onMount } from "svelte";
 
   onMount(() => {

app/src/routes/(time)/time/[courseid]/[...userid]/+page.svelte

@@ -1,18 +1,19 @@
 <script lang="ts">
   import { onMount } from "svelte";
-  import type { PageData } from "../../$types";
+
   import { fade } from "svelte/transition";
   import { writable, type Writable } from "svelte/store";
   import { Tab, TabGroup } from "@skeletonlabs/skeleton";
 
-  import { currentUser, currentCourse } from "$lib/stores";
-  import LabTime from "$lib/time/LabTime.svelte";
-  import InstructorLabTime from "$lib/time/InstructorLabTime.svelte";
-  import InstructorCalendarTime from "$lib/time/InstructorCalendarTime.svelte";
-  import NavBar from "$lib/navigators/NavBar.svelte";
-  import CalendarTime from "$lib/time/CalendarTime.svelte";
+  import {  currentCourse } from "$lib/stores";
+  import LabTime from "$lib/ui/time/LabTime.svelte";
+  import InstructorLabTime from "$lib/ui/time/InstructorLabTime.svelte";
+  import InstructorCalendarTime from "$lib/ui/time/InstructorCalendarTime.svelte";
+
+  import CalendarTime from "$lib/ui/time/CalendarTime.svelte";
   import { authService } from "$lib/services/auth";
-  import { page } from "$app/stores";
+
+  import type { PageData } from "./$types";
 
   export let data: PageData;
   const storeTab: Writable<string> = writable("Labs");

app/src/routes/(time)/time/[courseid]/[...userid]/+page.ts

@@ -1,10 +1,10 @@
 import type { PageLoad } from "./$types";
 import { courseService } from "$lib/services/course";
-import { fetchAllUsers, fetchUserById } from "$lib/utils/metrics";
-import type { Course } from "$lib/models/course";
-import type { UserMetric } from "$lib/types/metrics";
+import { fetchAllUsers, fetchUserById } from "$lib/services/utils/metrics";
+import type { Course } from "$lib/services/models/course";
+import type { UserMetric } from "$lib/services/types/metrics";
 import { getKeys } from "$lib/environment";
-import { initFirebase } from "$lib/utils/firebase";
+import { initFirebase } from "$lib/services/utils/firebase";
 
 export const ssr = false;