diff --git a/client/src/components/content-block-form/ContentsForm.vue b/client/src/components/content-block-form/ContentsForm.vue
index dcceea35..0ca42929 100644
--- a/client/src/components/content-block-form/ContentsForm.vue
+++ b/client/src/components/content-block-form/ContentsForm.vue
@@ -82,21 +82,21 @@
 </template>
 
 <script>
-  import Modal from '@/components/Modal';
-  import ContentBlockElementChooserWidget from '@/components/content-forms/ContentBlockElementChooserWidget';
-  import ModalInput from '@/components/ModalInput';
-  import AddContentElement from '@/components/AddContentElement';
-  import LinkForm from '@/components/content-forms/LinkForm';
-  import VideoForm from '@/components/content-forms/VideoForm';
-  import ImageForm from '@/components/content-forms/ImageForm';
-  import DocumentForm from '@/components/content-forms/DocumentForm';
-  import AssignmentForm from '@/components/content-forms/AssignmentForm';
-  import TextForm from '@/components/content-forms/TextForm';
-  import TrashIcon from '@/components/icons/TrashIcon';
-  import Checkbox from '@/components/ui/Checkbox';
-
   import {meQuery} from '@/graphql/queries';
 
+  const Modal = () => import('@/components/Modal');
+  const ContentBlockElementChooserWidget = () => import('@/components/content-forms/ContentBlockElementChooserWidget');
+  const ModalInput = () => import('@/components/ModalInput');
+  const AddContentElement = () => import('@/components/AddContentElement');
+  const LinkForm = () => import('@/components/content-forms/LinkForm');
+  const VideoForm = () => import('@/components/content-forms/VideoForm');
+  const ImageForm = () => import('@/components/content-forms/ImageForm');
+  const DocumentForm = () => import('@/components/content-forms/DocumentForm');
+  const AssignmentForm = () => import('@/components/content-forms/AssignmentForm');
+  const TextForm = () => import('@/components/content-forms/TextForm');
+  const TrashIcon = () => import('@/components/icons/TrashIcon');
+  const Checkbox = () => import('@/components/ui/Checkbox');
+
   export default {
     props: {
       'content-block': Object,
diff --git a/client/src/components/portfolio/PortfolioOnboarding.vue b/client/src/components/portfolio/PortfolioOnboarding.vue
index 0e5a5576..fd03c03e 100644
--- a/client/src/components/portfolio/PortfolioOnboarding.vue
+++ b/client/src/components/portfolio/PortfolioOnboarding.vue
@@ -20,8 +20,8 @@
 </template>
 
 <script>
-  import PortfolioIllustration from '@/components/illustrations/PortfolioIllustration';
-  import CreateProjectButton from '@/components/portfolio/CreateProjectButton';
+  const PortfolioIllustration = () => import('@/components/illustrations/PortfolioIllustration');
+  const CreateProjectButton = () => import('@/components/portfolio/CreateProjectButton');
   export default {
     components: {CreateProjectButton, PortfolioIllustration},
   };
diff --git a/client/src/components/rooms/RoomsOnboarding.vue b/client/src/components/rooms/RoomsOnboarding.vue
index 66fbf1f4..0ba1ff65 100644
--- a/client/src/components/rooms/RoomsOnboarding.vue
+++ b/client/src/components/rooms/RoomsOnboarding.vue
@@ -24,7 +24,7 @@
 
 <script>
   import {NEW_ROOM_PAGE} from '@/router/room.names';
-  import RoomsIllustration from '@/components/illustrations/RoomsIllustration';
+  const RoomsIllustration = () => import('@/components/illustrations/RoomsIllustration');
 
   export default {
     props: {
diff --git a/client/src/layouts/SplitLayout.vue b/client/src/layouts/SplitLayout.vue
index 49a2438c..cf779a55 100644
--- a/client/src/layouts/SplitLayout.vue
+++ b/client/src/layouts/SplitLayout.vue
@@ -10,10 +10,10 @@
 </template>
 
 <script>
-  import ContentsIllustration from '@/components/illustrations/ContentsIllustration';
-  import PortfolioIllustration from '@/components/illustrations/PortfolioIllustration';
-  import RoomsIllustration from '@/components/illustrations/RoomsIllustration';
-  import HelloIllustration from '@/components/illustrations/HelloIllustration';
+  const ContentsIllustration = () => import('@/components/illustrations/ContentsIllustration');
+  const PortfolioIllustration = () => import('@/components/illustrations/PortfolioIllustration');
+  const RoomsIllustration = () => import('@/components/illustrations/RoomsIllustration');
+  const HelloIllustration = () => import('@/components/illustrations/HelloIllustration');
 
   export default {
     components: {
diff --git a/client/src/pages/hello.vue b/client/src/pages/hello.vue
index 98d71499..c26bd6f5 100644
--- a/client/src/pages/hello.vue
+++ b/client/src/pages/hello.vue
@@ -66,7 +66,7 @@
   import HepLogoNoClaim from '@/components/icons/HepLogoNoClaim';
   import EhbLogo from '@/components/icons/EhbLogo';
   import Logo from '@/components/icons/Logo';
-  import HelloIllustration from '@/components/illustrations/HelloIllustration';
+  const HelloIllustration = () => import('@/components/illustrations/HelloIllustration');
 
   export default {
     mixins: [pageTitleMixin],
diff --git a/client/src/pages/start-old.vue b/client/src/pages/start-old.vue
index 834a338d..8081425c 100644
--- a/client/src/pages/start-old.vue
+++ b/client/src/pages/start-old.vue
@@ -59,14 +59,14 @@
   import NewsTeaser from '@/components/news/NewsTeaserOld.vue';
   import HeaderBar from '@/components/HeaderBar';
 
-  import ContentsIllustration from '@/components/illustrations/ContentsIllustration';
-  import PortfolioIllustration from '@/components/illustrations/PortfolioIllustration';
-  import RoomsIllustration from '@/components/illustrations/RoomsIllustration';
-
   import MobileHeader from '@/components/MobileHeader';
 
   import meMixin from '@/mixins/me';
 
+  const ContentsIllustration = () => import('@/components/illustrations/ContentsIllustration');
+  const PortfolioIllustration = () => import('@/components/illustrations/PortfolioIllustration');
+  const RoomsIllustration = () => import('@/components/illustrations/RoomsIllustration');
+
   export default {
 
     mixins: [meMixin],
diff --git a/client/src/router/module.routes.js b/client/src/router/module.routes.js
index 624cab31..c974e902 100644
--- a/client/src/router/module.routes.js
+++ b/client/src/router/module.routes.js
@@ -13,8 +13,8 @@ const module = () => import('@/pages/module/module');
 const submissions = () => import('@/pages/submissions');
 const moduleVisibility = () => import('@/pages/module/moduleVisibility');
 const settingsPage = () => import('@/pages/module/moduleSettings');
-const snapshots = () => import('@/pages/module/moduleSettings');
-const snapshot = () => import('@/pages/module/moduleSettings');
+const snapshots = () => import('@/pages/snapshot/snapshots');
+const snapshot = () => import('@/pages/snapshot/snapshot');
 
 export default [
   {