diff --git a/src/lib/components/AuthenticationBox.svelte b/src/lib/components/AuthenticationBox.svelte
deleted file mode 100644
index 3930c05..0000000
--- a/src/lib/components/AuthenticationBox.svelte
+++ /dev/null
@@ -1,57 +0,0 @@
-<script>
-  // # # # # # # # # # # # # #
-  //
-  //  Authentication box
-  //
-  // # # # # # # # # # # # # #
-  import {
-    login,
-    logout,
-    isAuthenticated,
-    profile,
-  } from "$lib/modules/authentication.js"
-</script>
-
-<div
-  class="auth-box"
-  on:click={() => {
-    if (!$isAuthenticated) {
-      login()
-    } else {
-      logout()
-    }
-  }}
->
-  {#if $isAuthenticated}
-    <div>
-      {$profile && $profile.name ? $profile.name + " (Log out)" : "Log out"}
-    </div>
-  {:else}Login{/if}
-</div>
-
-<style lang="scss">
-  @import "src/lib/style/variables.scss";
-
-  .auth-box {
-    position: fixed;
-    top: 40px;
-    right: 10px;
-    background: $e-ink-medium;
-    border: 1px solid $e-ink-dark;
-    cursor: pointer;
-    font-size: $font-size-extra-small;
-    z-index: 10000;
-    width: 60px;
-    height: 30px;
-    text-align: center;
-    line-height: 27px;
-
-    @include screen-size("small") {
-      display: none;
-    }
-
-    &:hover {
-      opacity: 0.8;
-    }
-  }
-</style>
diff --git a/src/lib/components/main-content.svelte b/src/lib/components/main-content.svelte
index d86e58a..2fce332 100644
--- a/src/lib/components/main-content.svelte
+++ b/src/lib/components/main-content.svelte
@@ -13,12 +13,12 @@
   import { dateTimeFormat, longFormatDate } from "$lib/modules/utilities.js"
 
   // __ COMPONENTS
-  import Blocks from "$lib/components/blocks/blocks.svelte"
-  import SeeAlso from "$lib/components/see-also.svelte"
+  import Blocks from "$lib/components/ui/content-parser/blocks.svelte"
+  import SeeAlso from "$lib/components/ui/content/see-also.svelte"
   import PersonLink from "$lib/components/person-link.svelte"
 
   // __ GRAPHICS
-  import ExternalLink from "$lib/components/graphics/external-link.svelte"
+  import ExternalLink from "$lib/components/ui/graphics/external-link.svelte"
 
   // *** PROPS
   export let page
diff --git a/src/lib/components/Clock.svelte b/src/lib/components/ui/Clock.svelte
similarity index 100%
rename from src/lib/components/Clock.svelte
rename to src/lib/components/ui/Clock.svelte
diff --git a/src/lib/components/blocks/applicationButton.svelte b/src/lib/components/ui/buttons/applicationButton.svelte
similarity index 98%
rename from src/lib/components/blocks/applicationButton.svelte
rename to src/lib/components/ui/buttons/applicationButton.svelte
index bcffde3..17400df 100644
--- a/src/lib/components/blocks/applicationButton.svelte
+++ b/src/lib/components/ui/buttons/applicationButton.svelte
@@ -10,7 +10,7 @@
   import has from "lodash/has.js"
 
   // __ COMPONENTS
-  import Blocks from "./blocks.svelte"
+  import Blocks from "../content-parser/blocks.svelte"
 
   // *** PROPS
   export let b = {}
diff --git a/src/lib/components/world-layers/Grid.svelte b/src/lib/components/ui/content-parser/Grid.svelte
similarity index 100%
rename from src/lib/components/world-layers/Grid.svelte
rename to src/lib/components/ui/content-parser/Grid.svelte
diff --git a/src/lib/components/blocks/blocks.svelte b/src/lib/components/ui/content-parser/blocks.svelte
similarity index 95%
rename from src/lib/components/blocks/blocks.svelte
rename to src/lib/components/ui/content-parser/blocks.svelte
index 4b1601b..cd197d6 100644
--- a/src/lib/components/blocks/blocks.svelte
+++ b/src/lib/components/ui/content-parser/blocks.svelte
@@ -16,7 +16,7 @@
   import Divider from "./divider.svelte"
   import Columns from "./columns.svelte"
   import DonationWidget from "./donationWidget.svelte"
-  import ApplicationButton from "./applicationButton.svelte"
+  import ApplicationButton from "../../ui/buttons/applicationButton.svelte"
   import Faq from "./faq.svelte"
   import Video from "./video.svelte"
 
diff --git a/src/lib/components/blocks/columns.svelte b/src/lib/components/ui/content-parser/columns.svelte
similarity index 100%
rename from src/lib/components/blocks/columns.svelte
rename to src/lib/components/ui/content-parser/columns.svelte
diff --git a/src/lib/components/blocks/divider.svelte b/src/lib/components/ui/content-parser/divider.svelte
similarity index 100%
rename from src/lib/components/blocks/divider.svelte
rename to src/lib/components/ui/content-parser/divider.svelte
diff --git a/src/lib/components/blocks/donationWidget.svelte b/src/lib/components/ui/content-parser/donationWidget.svelte
similarity index 100%
rename from src/lib/components/blocks/donationWidget.svelte
rename to src/lib/components/ui/content-parser/donationWidget.svelte
diff --git a/src/lib/components/blocks/embed.svelte b/src/lib/components/ui/content-parser/embed.svelte
similarity index 100%
rename from src/lib/components/blocks/embed.svelte
rename to src/lib/components/ui/content-parser/embed.svelte
diff --git a/src/lib/components/blocks/faq.svelte b/src/lib/components/ui/content-parser/faq.svelte
similarity index 94%
rename from src/lib/components/blocks/faq.svelte
rename to src/lib/components/ui/content-parser/faq.svelte
index ce33154..05f6da5 100644
--- a/src/lib/components/blocks/faq.svelte
+++ b/src/lib/components/ui/content-parser/faq.svelte
@@ -9,7 +9,7 @@
   import slugify from "slugify"
 
   // __ COMPONENTS
-  import QA from "$lib/components/qa.svelte"
+  import QA from "./qa.svelte"
 
   // *** PROPS
   export let b = {}
diff --git a/src/lib/components/blocks/html.svelte b/src/lib/components/ui/content-parser/html.svelte
similarity index 100%
rename from src/lib/components/blocks/html.svelte
rename to src/lib/components/ui/content-parser/html.svelte
diff --git a/src/lib/components/blocks/image.svelte b/src/lib/components/ui/content-parser/image.svelte
similarity index 100%
rename from src/lib/components/blocks/image.svelte
rename to src/lib/components/ui/content-parser/image.svelte
diff --git a/src/lib/components/blocks/imageFromMainSite.svelte b/src/lib/components/ui/content-parser/imageFromMainSite.svelte
similarity index 100%
rename from src/lib/components/blocks/imageFromMainSite.svelte
rename to src/lib/components/ui/content-parser/imageFromMainSite.svelte
diff --git a/src/lib/components/blocks/invertedBlock.svelte b/src/lib/components/ui/content-parser/invertedBlock.svelte
similarity index 100%
rename from src/lib/components/blocks/invertedBlock.svelte
rename to src/lib/components/ui/content-parser/invertedBlock.svelte
diff --git a/src/lib/components/blocks/logoBlock.svelte b/src/lib/components/ui/content-parser/logoBlock.svelte
similarity index 94%
rename from src/lib/components/blocks/logoBlock.svelte
rename to src/lib/components/ui/content-parser/logoBlock.svelte
index 81a0e81..9246a86 100644
--- a/src/lib/components/blocks/logoBlock.svelte
+++ b/src/lib/components/ui/content-parser/logoBlock.svelte
@@ -8,7 +8,7 @@
   import Text from "./text.svelte"
 
   // __ GRAPHICS
-  import BlockBeam from "$lib/components/graphics/block-beam.svelte"
+  import BlockBeam from "$lib/components/ui/graphics/block-beam.svelte"
 
   // *** PROPS
   export let b = {}
diff --git a/src/lib/components/qa.svelte b/src/lib/components/ui/content-parser/qa.svelte
similarity index 86%
rename from src/lib/components/qa.svelte
rename to src/lib/components/ui/content-parser/qa.svelte
index c955be0..6066a01 100644
--- a/src/lib/components/qa.svelte
+++ b/src/lib/components/ui/content-parser/qa.svelte
@@ -9,11 +9,11 @@
   import has from "lodash/has.js"
 
   // __ COMPONENTS
-  import Blocks from "$lib/components/blocks/blocks.svelte"
+  import Blocks from "$lib/components/ui/content-parser/blocks.svelte"
 
   // __ GRAPHICS
-  import ArrowDown from "$lib/components/graphics/arrow-down.svelte"
-  import ArrowLeft from "$lib/components/graphics/arrow-left.svelte"
+  import ArrowDown from "$lib/components/ui/graphics/arrow-down.svelte"
+  import ArrowLeft from "$lib/components/ui/graphics/arrow-left.svelte"
 
   // *** PROPS
   export let item = {}
diff --git a/src/lib/components/blocks/text.svelte b/src/lib/components/ui/content-parser/text.svelte
similarity index 95%
rename from src/lib/components/blocks/text.svelte
rename to src/lib/components/ui/content-parser/text.svelte
index fce0333..3f71450 100644
--- a/src/lib/components/blocks/text.svelte
+++ b/src/lib/components/ui/content-parser/text.svelte
@@ -11,7 +11,7 @@
   import PersonLink from "$lib/components/person-link.svelte"
 
   // __ GRAPHICS
-  import ExternalLink from "$lib/components/graphics/external-link.svelte"
+  import ExternalLink from "$lib/components/ui/graphics/external-link.svelte"
 
   // *** PROPS
   export let b = {}
diff --git a/src/lib/components/blocks/video.svelte b/src/lib/components/ui/content-parser/video.svelte
similarity index 96%
rename from src/lib/components/blocks/video.svelte
rename to src/lib/components/ui/content-parser/video.svelte
index 536f8b0..0c59a3a 100644
--- a/src/lib/components/blocks/video.svelte
+++ b/src/lib/components/ui/content-parser/video.svelte
@@ -10,7 +10,7 @@
   import get from "lodash/get.js"
 
   // __ GRAPHICS
-  import PlayArrow from "$lib/components/graphics/play-arrow.svelte"
+  import PlayArrow from "$lib/components/ui/graphics/play-arrow.svelte"
 
   // *** PROPS
   export let b = {}
diff --git a/src/lib/components/ArticleBox.svelte b/src/lib/components/ui/content/ArticleBox.svelte
similarity index 96%
rename from src/lib/components/ArticleBox.svelte
rename to src/lib/components/ui/content/ArticleBox.svelte
index 72f3469..392f080 100644
--- a/src/lib/components/ArticleBox.svelte
+++ b/src/lib/components/ui/content/ArticleBox.svelte
@@ -12,9 +12,9 @@
   import { enterArticle, leaveArticle, players } from "$lib/modules/engine.js"
   import { dateTimeFormat, isUpcoming } from "$lib/modules/utilities.js"
   import { checkObjectOverlap } from "$lib/modules/movement.js"
-  import VideoPlayer from "$lib/components/VideoPlayer.svelte"
-  import Blocks from "$lib/components/blocks/blocks.svelte"
-  import BulletinBoardEvent from "$lib/components/bulletin-board-event.svelte"
+  import VideoPlayer from "$lib/components/ui/media/VideoPlayer.svelte"
+  import Blocks from "$lib/components/ui/content-parser/blocks.svelte"
+  import BulletinBoardEvent from "$lib/components/ui/content/bulletin-board-event.svelte"
 
   // *** PROPS
   export let article = {}
diff --git a/src/lib/components/bulletin-board-event.svelte b/src/lib/components/ui/content/bulletin-board-event.svelte
similarity index 97%
rename from src/lib/components/bulletin-board-event.svelte
rename to src/lib/components/ui/content/bulletin-board-event.svelte
index d17d8d6..4271038 100644
--- a/src/lib/components/bulletin-board-event.svelte
+++ b/src/lib/components/ui/content/bulletin-board-event.svelte
@@ -10,7 +10,7 @@
     renderBlockText,
     renderBlockTextFromMainSite,
   } from "$lib/modules/sanity.js"
-  import Blocks from "$lib/components/blocks/blocks.svelte"
+  import Blocks from "$lib/components/ui/content-parser/blocks.svelte"
   import { dateTimeFormat, isUpcoming } from "$lib/modules/utilities.js"
   export let event = {}
 
diff --git a/src/lib/components/see-also.svelte b/src/lib/components/ui/content/see-also.svelte
similarity index 94%
rename from src/lib/components/see-also.svelte
rename to src/lib/components/ui/content/see-also.svelte
index 5143af4..a47225f 100644
--- a/src/lib/components/see-also.svelte
+++ b/src/lib/components/ui/content/see-also.svelte
@@ -10,7 +10,7 @@
   import get from "lodash/get.js"
 
   // __ GRAPHICS
-  import ExternalLink from "$lib/components/graphics/external-link.svelte"
+  import ExternalLink from "$lib/components/ui/graphics/external-link.svelte"
 
   // *** PROPS
   export let externalLinks = []
diff --git a/src/lib/components/graphics/EyebeamLogo.svelte b/src/lib/components/ui/graphics/EyebeamLogo.svelte
similarity index 100%
rename from src/lib/components/graphics/EyebeamLogo.svelte
rename to src/lib/components/ui/graphics/EyebeamLogo.svelte
diff --git a/src/lib/components/graphics/SoundOff.svelte b/src/lib/components/ui/graphics/SoundOff.svelte
similarity index 100%
rename from src/lib/components/graphics/SoundOff.svelte
rename to src/lib/components/ui/graphics/SoundOff.svelte
diff --git a/src/lib/components/graphics/SoundOn.svelte b/src/lib/components/ui/graphics/SoundOn.svelte
similarity index 100%
rename from src/lib/components/graphics/SoundOn.svelte
rename to src/lib/components/ui/graphics/SoundOn.svelte
diff --git a/src/lib/components/graphics/animated-beam.svelte b/src/lib/components/ui/graphics/animated-beam.svelte
similarity index 100%
rename from src/lib/components/graphics/animated-beam.svelte
rename to src/lib/components/ui/graphics/animated-beam.svelte
diff --git a/src/lib/components/graphics/arrow-down.svelte b/src/lib/components/ui/graphics/arrow-down.svelte
similarity index 100%
rename from src/lib/components/graphics/arrow-down.svelte
rename to src/lib/components/ui/graphics/arrow-down.svelte
diff --git a/src/lib/components/graphics/arrow-left.svelte b/src/lib/components/ui/graphics/arrow-left.svelte
similarity index 100%
rename from src/lib/components/graphics/arrow-left.svelte
rename to src/lib/components/ui/graphics/arrow-left.svelte
diff --git a/src/lib/components/graphics/arrow-up.svelte b/src/lib/components/ui/graphics/arrow-up.svelte
similarity index 100%
rename from src/lib/components/graphics/arrow-up.svelte
rename to src/lib/components/ui/graphics/arrow-up.svelte
diff --git a/src/lib/components/graphics/big-beam.svelte b/src/lib/components/ui/graphics/big-beam.svelte
similarity index 100%
rename from src/lib/components/graphics/big-beam.svelte
rename to src/lib/components/ui/graphics/big-beam.svelte
diff --git a/src/lib/components/graphics/block-beam.svelte b/src/lib/components/ui/graphics/block-beam.svelte
similarity index 100%
rename from src/lib/components/graphics/block-beam.svelte
rename to src/lib/components/ui/graphics/block-beam.svelte
diff --git a/src/lib/components/graphics/external-link.svelte b/src/lib/components/ui/graphics/external-link.svelte
similarity index 100%
rename from src/lib/components/graphics/external-link.svelte
rename to src/lib/components/ui/graphics/external-link.svelte
diff --git a/src/lib/components/graphics/full-beam.svelte b/src/lib/components/ui/graphics/full-beam.svelte
similarity index 100%
rename from src/lib/components/graphics/full-beam.svelte
rename to src/lib/components/ui/graphics/full-beam.svelte
diff --git a/src/lib/components/graphics/half-beam.svelte b/src/lib/components/ui/graphics/half-beam.svelte
similarity index 100%
rename from src/lib/components/graphics/half-beam.svelte
rename to src/lib/components/ui/graphics/half-beam.svelte
diff --git a/src/lib/components/graphics/hamburger.svelte b/src/lib/components/ui/graphics/hamburger.svelte
similarity index 100%
rename from src/lib/components/graphics/hamburger.svelte
rename to src/lib/components/ui/graphics/hamburger.svelte
diff --git a/src/lib/components/graphics/instagram.svelte b/src/lib/components/ui/graphics/instagram.svelte
similarity index 100%
rename from src/lib/components/graphics/instagram.svelte
rename to src/lib/components/ui/graphics/instagram.svelte
diff --git a/src/lib/components/graphics/logo.svelte b/src/lib/components/ui/graphics/logo.svelte
similarity index 100%
rename from src/lib/components/graphics/logo.svelte
rename to src/lib/components/ui/graphics/logo.svelte
diff --git a/src/lib/components/graphics/menu-x.svelte b/src/lib/components/ui/graphics/menu-x.svelte
similarity index 100%
rename from src/lib/components/graphics/menu-x.svelte
rename to src/lib/components/ui/graphics/menu-x.svelte
diff --git a/src/lib/components/graphics/newsletter.svelte b/src/lib/components/ui/graphics/newsletter.svelte
similarity index 100%
rename from src/lib/components/graphics/newsletter.svelte
rename to src/lib/components/ui/graphics/newsletter.svelte
diff --git a/src/lib/components/graphics/pause-bars.svelte b/src/lib/components/ui/graphics/pause-bars.svelte
similarity index 100%
rename from src/lib/components/graphics/pause-bars.svelte
rename to src/lib/components/ui/graphics/pause-bars.svelte
diff --git a/src/lib/components/graphics/play-arrow.svelte b/src/lib/components/ui/graphics/play-arrow.svelte
similarity index 100%
rename from src/lib/components/graphics/play-arrow.svelte
rename to src/lib/components/ui/graphics/play-arrow.svelte
diff --git a/src/lib/components/graphics/search.svelte b/src/lib/components/ui/graphics/search.svelte
similarity index 100%
rename from src/lib/components/graphics/search.svelte
rename to src/lib/components/ui/graphics/search.svelte
diff --git a/src/lib/components/graphics/triangle-down.svelte b/src/lib/components/ui/graphics/triangle-down.svelte
similarity index 100%
rename from src/lib/components/graphics/triangle-down.svelte
rename to src/lib/components/ui/graphics/triangle-down.svelte
diff --git a/src/lib/components/graphics/triangle-right.svelte b/src/lib/components/ui/graphics/triangle-right.svelte
similarity index 100%
rename from src/lib/components/graphics/triangle-right.svelte
rename to src/lib/components/ui/graphics/triangle-right.svelte
diff --git a/src/lib/components/graphics/twitter.svelte b/src/lib/components/ui/graphics/twitter.svelte
similarity index 100%
rename from src/lib/components/graphics/twitter.svelte
rename to src/lib/components/ui/graphics/twitter.svelte
diff --git a/src/lib/components/graphics/x.svelte b/src/lib/components/ui/graphics/x.svelte
similarity index 100%
rename from src/lib/components/graphics/x.svelte
rename to src/lib/components/ui/graphics/x.svelte
diff --git a/src/lib/components/graphics/youtube.svelte b/src/lib/components/ui/graphics/youtube.svelte
similarity index 100%
rename from src/lib/components/graphics/youtube.svelte
rename to src/lib/components/ui/graphics/youtube.svelte
diff --git a/src/lib/components/StreamPlayer.svelte b/src/lib/components/ui/media/StreamPlayer.svelte
similarity index 97%
rename from src/lib/components/StreamPlayer.svelte
rename to src/lib/components/ui/media/StreamPlayer.svelte
index 20759f9..f482ff4 100644
--- a/src/lib/components/StreamPlayer.svelte
+++ b/src/lib/components/ui/media/StreamPlayer.svelte
@@ -13,8 +13,8 @@
   import { quartOut } from "svelte/easing"
   import { isPhone  } from "$lib/modules/ui.js"
   import getVideoId from "get-video-id"
-  import PlayArrow from "$lib/components/graphics/play-arrow.svelte"
-  import PauseBars from "$lib/components/graphics/pause-bars.svelte"
+  import PlayArrow from "$lib/components/ui/graphics/play-arrow.svelte"
+  import PauseBars from "$lib/components/ui/graphics/pause-bars.svelte"
 
   // *** PROPS
   export let streamUrl = ""
diff --git a/src/lib/components/VideoPlayer.svelte b/src/lib/components/ui/media/VideoPlayer.svelte
similarity index 100%
rename from src/lib/components/VideoPlayer.svelte
rename to src/lib/components/ui/media/VideoPlayer.svelte
diff --git a/src/lib/components/world-layers/videoLibraries/VideoLibrary.svelte b/src/lib/components/ui/media/videoLibraries/VideoLibrary.svelte
similarity index 100%
rename from src/lib/components/world-layers/videoLibraries/VideoLibrary.svelte
rename to src/lib/components/ui/media/videoLibraries/VideoLibrary.svelte
diff --git a/src/lib/components/world-layers/videoLibraries/VideoLibraryComponent.svelte b/src/lib/components/ui/media/videoLibraries/VideoLibraryComponent.svelte
similarity index 100%
rename from src/lib/components/world-layers/videoLibraries/VideoLibraryComponent.svelte
rename to src/lib/components/ui/media/videoLibraries/VideoLibraryComponent.svelte
diff --git a/src/lib/components/world-layers/videoLibraries/VideoLibraryComponentMobile.svelte b/src/lib/components/ui/media/videoLibraries/VideoLibraryComponentMobile.svelte
similarity index 100%
rename from src/lib/components/world-layers/videoLibraries/VideoLibraryComponentMobile.svelte
rename to src/lib/components/ui/media/videoLibraries/VideoLibraryComponentMobile.svelte
diff --git a/src/lib/components/PhoneNavigation.svelte b/src/lib/components/ui/navigation/PhoneNavigation.svelte
similarity index 100%
rename from src/lib/components/PhoneNavigation.svelte
rename to src/lib/components/ui/navigation/PhoneNavigation.svelte
diff --git a/src/lib/components/menubar.svelte b/src/lib/components/ui/navigation/menubar.svelte
similarity index 97%
rename from src/lib/components/menubar.svelte
rename to src/lib/components/ui/navigation/menubar.svelte
index 3a8d2c3..dc4e7ab 100644
--- a/src/lib/components/menubar.svelte
+++ b/src/lib/components/ui/navigation/menubar.svelte
@@ -6,17 +6,17 @@
   // # # # # # # # # # # # # #
 
   // __ IMPORT
-  import Clock from "$lib/components/Clock.svelte"
+  import Clock from "$lib/components/ui/Clock.svelte"
   import sample from "lodash/sample.js"
   import { loadDataFromMainSite } from "$lib/modules/sanity.js"
   import has from "lodash/has.js"
 
   // __ COMPONENTS
-  import Blocks from "$lib/components/blocks/blocks.svelte"
+  import Blocks from "$lib/components/ui/content-parser/blocks.svelte"
 
   // __ GRAPHICS
-  import FullBeam from "$lib/components/graphics/full-beam.svelte"
-  import ArrowDown from "$lib/components/graphics/arrow-down.svelte"
+  import FullBeam from "$lib/components/ui/graphics/full-beam.svelte"
+  import ArrowDown from "$lib/components/ui/graphics/arrow-down.svelte"
 
   // __ STORES
   import { trayOpen, activeCity,activeMouse, activeVideoLibrary,VIDEO_LIBRARY_SLUG, urlHash } from "$lib/modules/ui.js"
diff --git a/src/lib/components/AvatarPicker.svelte b/src/lib/components/ui/overlays/AvatarPicker.svelte
similarity index 100%
rename from src/lib/components/AvatarPicker.svelte
rename to src/lib/components/ui/overlays/AvatarPicker.svelte
diff --git a/src/lib/components/overlays/Error.svelte b/src/lib/components/ui/overlays/Error.svelte
similarity index 100%
rename from src/lib/components/overlays/Error.svelte
rename to src/lib/components/ui/overlays/Error.svelte
diff --git a/src/lib/components/overlays/LoadingScreen.svelte b/src/lib/components/ui/overlays/LoadingScreen.svelte
similarity index 91%
rename from src/lib/components/overlays/LoadingScreen.svelte
rename to src/lib/components/ui/overlays/LoadingScreen.svelte
index ee6ba97..19b9742 100644
--- a/src/lib/components/overlays/LoadingScreen.svelte
+++ b/src/lib/components/ui/overlays/LoadingScreen.svelte
@@ -5,7 +5,7 @@
   //
   // # # # # # # # # # # # # #
   import { fade } from "svelte/transition"
-  import AnimatedBeam from "$lib/components/graphics/animated-beam.svelte"
+  import AnimatedBeam from "$lib/components/ui/graphics/animated-beam.svelte"
 </script>
 
 <div class="loading-screen" transition:fade={{ delay: 500 }}>
diff --git a/src/lib/components/overlays/Onboarding.svelte b/src/lib/components/ui/overlays/Onboarding.svelte
similarity index 98%
rename from src/lib/components/overlays/Onboarding.svelte
rename to src/lib/components/ui/overlays/Onboarding.svelte
index e6bf387..d7553c3 100644
--- a/src/lib/components/overlays/Onboarding.svelte
+++ b/src/lib/components/ui/overlays/Onboarding.svelte
@@ -9,7 +9,7 @@
   import { loadOnboardingTutorial } from "$lib/modules/world.js"
   import { renderBlockText } from "$lib/modules/sanity.js"
   import get from "lodash/get.js"
-  import AvatarPicker from "$lib/components/AvatarPicker.svelte"
+  import AvatarPicker from "$lib/components/ui/overlays/AvatarPicker.svelte"
   import { isPhone } from "$lib/modules/ui.js" 
   import { createEventDispatcher } from "svelte"
   const dispatch = createEventDispatcher()
diff --git a/src/lib/components/overlays/Reconnection.svelte b/src/lib/components/ui/overlays/Reconnection.svelte
similarity index 100%
rename from src/lib/components/overlays/Reconnection.svelte
rename to src/lib/components/ui/overlays/Reconnection.svelte
diff --git a/src/lib/components/text-components/Caption.svelte b/src/lib/components/ui/text/Caption.svelte
similarity index 96%
rename from src/lib/components/text-components/Caption.svelte
rename to src/lib/components/ui/text/Caption.svelte
index 1cbed2d..cb4b560 100644
--- a/src/lib/components/text-components/Caption.svelte
+++ b/src/lib/components/ui/text/Caption.svelte
@@ -12,7 +12,7 @@
 
   import { isPhone } from "$lib/modules/ui.js" 
   // *** GRAPHICS
-  import TriangleDown from "$lib/components/graphics/triangle-down.svelte"
+  import TriangleDown from "$lib/components/ui/graphics/triangle-down.svelte"
   const dispatch = createEventDispatcher()
   const transitionSettings = { duration: 500 }
 
diff --git a/src/lib/components/text-components/ObjectDialog.svelte b/src/lib/components/ui/text/ObjectDialog.svelte
similarity index 100%
rename from src/lib/components/text-components/ObjectDialog.svelte
rename to src/lib/components/ui/text/ObjectDialog.svelte
diff --git a/src/lib/components/text-components/ObjectInspectionBox.svelte b/src/lib/components/ui/text/ObjectInspectionBox.svelte
similarity index 100%
rename from src/lib/components/text-components/ObjectInspectionBox.svelte
rename to src/lib/components/ui/text/ObjectInspectionBox.svelte
diff --git a/src/lib/components/text-components/RoomDialog.svelte b/src/lib/components/ui/text/RoomDialog.svelte
similarity index 100%
rename from src/lib/components/text-components/RoomDialog.svelte
rename to src/lib/components/ui/text/RoomDialog.svelte
diff --git a/src/lib/components/text-components/RoomEntryBox.svelte b/src/lib/components/ui/text/RoomEntryBox.svelte
similarity index 100%
rename from src/lib/components/text-components/RoomEntryBox.svelte
rename to src/lib/components/ui/text/RoomEntryBox.svelte
diff --git a/src/lib/components/world-layers/AmbientAudio.svelte b/src/lib/components/world/AmbientAudio.svelte
similarity index 100%
rename from src/lib/components/world-layers/AmbientAudio.svelte
rename to src/lib/components/world/AmbientAudio.svelte
diff --git a/src/lib/components/world-layers/Players.svelte b/src/lib/components/world/Players.svelte
similarity index 86%
rename from src/lib/components/world-layers/Players.svelte
rename to src/lib/components/world/Players.svelte
index 13ae85d..fc24f64 100644
--- a/src/lib/components/world-layers/Players.svelte
+++ b/src/lib/components/world/Players.svelte
@@ -4,7 +4,7 @@
   //  Players
   //
   // # # # # # # # # # # # # #
-  import Avatar from "$lib/components/world-layers/avatars/Avatar.svelte"
+  import Avatar from "$lib/components/world/avatars/Avatar.svelte"
 
   //   *** PROPS
   export let players = {}
diff --git a/src/lib/components/world-layers/Room.svelte b/src/lib/components/world/Room.svelte
similarity index 100%
rename from src/lib/components/world-layers/Room.svelte
rename to src/lib/components/world/Room.svelte
diff --git a/src/lib/components/world-layers/TargetMarker.svelte b/src/lib/components/world/TargetMarker.svelte
similarity index 100%
rename from src/lib/components/world-layers/TargetMarker.svelte
rename to src/lib/components/world/TargetMarker.svelte
diff --git a/src/lib/components/world-layers/avatars/Avatar.svelte b/src/lib/components/world/avatars/Avatar.svelte
similarity index 100%
rename from src/lib/components/world-layers/avatars/Avatar.svelte
rename to src/lib/components/world/avatars/Avatar.svelte
diff --git a/src/lib/components/world-layers/feed/Feed.svelte b/src/lib/components/world/feed/Feed.svelte
similarity index 97%
rename from src/lib/components/world-layers/feed/Feed.svelte
rename to src/lib/components/world/feed/Feed.svelte
index 869f79b..44d820e 100644
--- a/src/lib/components/world-layers/feed/Feed.svelte
+++ b/src/lib/components/world/feed/Feed.svelte
@@ -2,8 +2,8 @@
   import { fade } from "svelte/transition"
   import { quartOut } from "svelte/easing"
   import { activeFeed } from "$lib/modules//ui.js"
-  import Blocks from "$lib/components/blocks/blocks.svelte"
-  import FeedItem from "$lib/components/world-layers/feed/FeedItem.svelte"
+  import Blocks from "$lib/components/ui/content-parser/blocks.svelte"
+  import FeedItem from "$lib/components/world/feed/FeedItem.svelte"
   export let feedItems = []
   export let isActive = false
   export let artistImageUrl
diff --git a/src/lib/components/world-layers/feed/FeedItem.svelte b/src/lib/components/world/feed/FeedItem.svelte
similarity index 83%
rename from src/lib/components/world-layers/feed/FeedItem.svelte
rename to src/lib/components/world/feed/FeedItem.svelte
index 8edf966..2791549 100644
--- a/src/lib/components/world-layers/feed/FeedItem.svelte
+++ b/src/lib/components/world/feed/FeedItem.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Blocks from "$lib/components/blocks/blocks.svelte"
+  import Blocks from "$lib/components/ui/content-parser/blocks.svelte"
   export let feedItem = {}
 </script>
 
diff --git a/src/lib/components/world-layers/objects/Object.svelte b/src/lib/components/world/objects/Object.svelte
similarity index 97%
rename from src/lib/components/world-layers/objects/Object.svelte
rename to src/lib/components/world/objects/Object.svelte
index b79231c..86dc3a5 100644
--- a/src/lib/components/world-layers/objects/Object.svelte
+++ b/src/lib/components/world/objects/Object.svelte
@@ -11,7 +11,7 @@
   import { showLabels, toolTipConfig } from "$lib/modules/ui.js"
   import { GRID_SIZE } from "$lib/modules/world.js"
   // IMPORTS
-  import Blocks from "$lib/components/blocks/blocks.svelte"
+  import Blocks from "$lib/components/ui/content-parser/blocks.svelte"
   
 
   //   *** PROPS
diff --git a/src/lib/components/world-layers/objects/Objects.svelte b/src/lib/components/world/objects/Objects.svelte
similarity index 100%
rename from src/lib/components/world-layers/objects/Objects.svelte
rename to src/lib/components/world/objects/Objects.svelte
diff --git a/src/lib/components/world-layers/portals/Portal.svelte b/src/lib/components/world/portals/Portal.svelte
similarity index 100%
rename from src/lib/components/world-layers/portals/Portal.svelte
rename to src/lib/components/world/portals/Portal.svelte
diff --git a/src/lib/components/world-layers/portals/Portals.svelte b/src/lib/components/world/portals/Portals.svelte
similarity index 100%
rename from src/lib/components/world-layers/portals/Portals.svelte
rename to src/lib/components/world/portals/Portals.svelte
diff --git a/src/lib/components/world-layers/schedule/Schedule.svelte b/src/lib/components/world/schedule/Schedule.svelte
similarity index 97%
rename from src/lib/components/world-layers/schedule/Schedule.svelte
rename to src/lib/components/world/schedule/Schedule.svelte
index a6688e2..b4e0041 100644
--- a/src/lib/components/world-layers/schedule/Schedule.svelte
+++ b/src/lib/components/world/schedule/Schedule.svelte
@@ -6,10 +6,8 @@
   export let vLib = []
   import { videoLibrary } from "$lib/modules/world.js"
   import { dateTimeFormat, isUpcoming, isOngoing, sortByDate } from "$lib/modules/utilities.js"
-  import Embed from "$lib/components/blocks/embed.svelte"
   import {STATE, uiState, isPhone} from '$lib/modules/ui.js'
   console.log('is phone: ', isPhone)
-  import { activeArticle } from "$lib/modules/ui.js"
   let selected = null;
 
   $: console.log('video library: ', videoLibrary)
diff --git a/src/lib/components/world-layers/zones/Zone.svelte b/src/lib/components/world/zones/Zone.svelte
similarity index 100%
rename from src/lib/components/world-layers/zones/Zone.svelte
rename to src/lib/components/world/zones/Zone.svelte
diff --git a/src/lib/components/world-layers/zones/Zones.svelte b/src/lib/components/world/zones/Zones.svelte
similarity index 100%
rename from src/lib/components/world-layers/zones/Zones.svelte
rename to src/lib/components/world/zones/Zones.svelte
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index a490988..8a452da 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -8,15 +8,14 @@
   // * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
   // *** OVERLAYS
-  import LoadingScreen from "$lib/components/overlays/LoadingScreen.svelte"
-  import Error from "$lib/components/overlays/Error.svelte"
-  import Reconnection from "$lib/components/overlays/Reconnection.svelte"
+  import LoadingScreen from "$lib/components/ui/overlays/LoadingScreen.svelte"
+  import Error from "$lib/components/ui/overlays/Error.svelte"
+  import Reconnection from "$lib/components/ui/overlays/Reconnection.svelte"
   // *** UI COMPONENTS
-  import Menubar from "$lib/components/menubar.svelte"
-  import AuthenticationBox from "$lib/components/AuthenticationBox.svelte"
+  import Menubar from "$lib/components/ui/navigation/menubar.svelte"
   // *** GRAPHICS
-  import SoundOn from "$lib/components/graphics/SoundOn.svelte"
-  import SoundOff from "$lib/components/graphics/SoundOff.svelte"
+  import SoundOn from "$lib/components/ui/graphics/SoundOn.svelte"
+  import SoundOff from "$lib/components/ui/graphics/SoundOff.svelte"
   import {
     STATE,
     uiState,
@@ -54,10 +53,7 @@
 <!-- Content from index.svelte -->
 <slot />
 
-<!-- AUTH TEST BOX -->
-{#if $uiState == STATE.READY && !$activeArticle}
-  <!--  <AuthenticationBox /> -->
-{/if}
+
 
 <!-- LOADING -->
 {#if $uiState == STATE.LOADING}
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 803cf23..fb84e60 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -15,27 +15,27 @@
   import { isMobileOrTablet} from "$lib/modules/utilities.js"
 
   // *** OVERLAYS
-  import Onboarding from "$lib/components/overlays/Onboarding.svelte"
+  import Onboarding from "$lib/components/ui/overlays/Onboarding.svelte"
   // *** WORLD LAYERS
-  import Room from "$lib/components/world-layers/Room.svelte"
-  import Players from "$lib/components/world-layers/Players.svelte"
-  import Objects from "$lib/components/world-layers/objects/Objects.svelte"
-  import Feed from "$lib/components/world-layers/feed/Feed.svelte"
-  import Zones from "$lib/components/world-layers/zones/Zones.svelte"
-  import AmbientAudio from "$lib/components/world-layers/AmbientAudio.svelte"
-  import Portals from "$lib/components/world-layers/portals/Portals.svelte"
-  import StreamPlayer from "$lib/components/StreamPlayer.svelte"
-  import ArticleBox from "$lib/components/ArticleBox.svelte"
+  import Room from "$lib/components/world/Room.svelte"
+  import Players from "$lib/components/world/Players.svelte"
+  import Objects from "$lib/components/world/objects/Objects.svelte"
+  import Feed from "$lib/components/world/feed/Feed.svelte"
+  import Zones from "$lib/components/world/zones/Zones.svelte"
+  import AmbientAudio from "$lib/components/world/AmbientAudio.svelte"
+  import Portals from "$lib/components/world/portals/Portals.svelte"
+  import StreamPlayer from "$lib/components/ui/media/StreamPlayer.svelte"
+  import ArticleBox from "$lib/components/ui/content/ArticleBox.svelte"
   // *** TEXT COMPONENTS
-  import RoomEntryBox from "$lib/components/text-components/RoomEntryBox.svelte"
-  import ObjectInspectionBox from "$lib/components/text-components/ObjectInspectionBox.svelte"
-  import Caption from "$lib/components/text-components/Caption.svelte"
+  import RoomEntryBox from "$lib/components/ui/text/RoomEntryBox.svelte"
+  import ObjectInspectionBox from "$lib/components/ui/text/ObjectInspectionBox.svelte"
+  import Caption from "$lib/components/ui/text/Caption.svelte"
   // *** CHAT
   import Chat from "$lib/components/chat/Chat.svelte"
   // *** SCHEDULE
-//  import Schedule from "$lib/components/world-layers/schedule/Schedule.svelte"
+//  import Schedule from "$lib/components/world/schedule/Schedule.svelte"
   // *** PHONE
-  import PhoneNavigation from "$lib/components/PhoneNavigation.svelte"
+  import PhoneNavigation from "$lib/components/ui/navigation/PhoneNavigation.svelte"
 
   import {
     connectToGameServer,
@@ -93,7 +93,7 @@
     infoLogger,
     errorLogger,
   } from "$lib/modules/utilities.js"
-  import VideoLibrary from "../lib/components/world-layers/videoLibraries/VideoLibrary.svelte";
+  import VideoLibrary from "../lib/components/ui/media/videoLibraries/VideoLibrary.svelte";
 
   // *** VARIABLES
   let viewportElement = {}