diff --git a/app/client/main.js b/app/client/main.js
index d9d770b7..6305c8ae 100644
--- a/app/client/main.js
+++ b/app/client/main.js
@@ -1,6 +1,6 @@
 import '/imports/api/simpleSchemaConfig.js';
-import '/imports/ui/vueSetup.js';
-import '/imports/ui/styles/stylesIndex.js';
+import '/imports/client/ui/vueSetup.js';
+import '/imports/client/ui/styles/stylesIndex.js';
 import '/imports/client/config.js';
 import '/imports/client/serviceWorker.js';
 
diff --git a/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js b/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js
index 5a8c84fe..9bb40898 100644
--- a/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js
@@ -12,7 +12,7 @@ import { reorderDocs } from '/imports/api/parenting/order.js';
 var snackbar;
 if (Meteor.isClient) {
   snackbar = require(
-    '/imports/ui/components/snackbars/SnackbarQueue.js'
+    '/imports/client/ui/components/snackbars/SnackbarQueue.js'
   ).snackbar
 }
 
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
index becf0775..2e78446f 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
@@ -5,7 +5,7 @@ import applyProperty from '../applyProperty.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { adjustQuantityWork } from '/imports/api/creature/creatureProperties/methods/adjustQuantity.js';
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '/imports/api/utility/numberToSignedString.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 import { resetProperties } from '/imports/api/creature/creatures/methods/restCreature.js';
 
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
index a5aa4bae..22de7aa7 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
@@ -1,10 +1,10 @@
 import rollDice from '/imports/parser/rollDice.js';
 import recalculateCalculation from './shared/recalculateCalculation.js';
 import applyProperty from '../applyProperty.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '/imports/api/utility/numberToSignedString.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
-export default function applySavingThrow(node, actionContext){
+export default function applySavingThrow(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
 
@@ -13,7 +13,7 @@ export default function applySavingThrow(node, actionContext){
   recalculateCalculation(prop.dc, actionContext);
 
   const dc = (prop.dc?.value);
-  if (!isFinite(dc)){
+  if (!isFinite(dc)) {
     actionContext.addLog({
       name: 'Error',
       value: 'Saving throw requires a DC',
@@ -29,8 +29,8 @@ export default function applySavingThrow(node, actionContext){
 
   // If there are no save targets, apply all children as if the save both
   // succeeeded and failed
-  if (!saveTargets?.length){
-    scope['$saveFailed'] = {value: true};
+  if (!saveTargets?.length) {
+    scope['$saveFailed'] = { value: true };
     scope['$saveSucceeded'] = { value: true };
     applyNodeTriggers(node, 'after', actionContext);
     return node.children.forEach(child => applyProperty(child, actionContext));
@@ -51,7 +51,7 @@ export default function applySavingThrow(node, actionContext){
 
     const save = target.variables[prop.stat];
 
-    if (!save){
+    if (!save) {
       actionContext.addLog({
         name: 'Saving throw error',
         value: 'No saving throw found: ' + prop.stat,
@@ -62,7 +62,7 @@ export default function applySavingThrow(node, actionContext){
     const rollModifierText = numberToSignedString(save.value, true);
 
     let value, values, resultPrefix;
-    if (save.advantage === 1){
+    if (save.advantage === 1) {
       const [a, b] = rollDice(2, 20);
       if (a >= b) {
         value = a;
@@ -71,7 +71,7 @@ export default function applySavingThrow(node, actionContext){
         value = b;
         resultPrefix = `Advantage\n1d20 [ ~~${a}~~, ${b} ] ${rollModifierText}`;
       }
-    } else if (save.advantage === -1){
+    } else if (save.advantage === -1) {
       const [a, b] = rollDice(2, 20);
       if (a <= b) {
         value = a;
@@ -85,14 +85,14 @@ export default function applySavingThrow(node, actionContext){
       value = values[0];
       resultPrefix = `1d20 [ ${value} ] ${rollModifierText}`
     }
-    scope['$saveDiceRoll'] = {value};
+    scope['$saveDiceRoll'] = { value };
     const result = value + save.value || 0;
-    scope['$saveRoll'] = {value: result};
+    scope['$saveRoll'] = { value: result };
     const saveSuccess = result >= dc;
-    if (saveSuccess){
-      scope['$saveSucceeded'] = {value: true};
+    if (saveSuccess) {
+      scope['$saveSucceeded'] = { value: true };
     } else {
-      scope['$saveFailed'] = {value: true};
+      scope['$saveFailed'] = { value: true };
     }
     if (!prop.silent) actionContext.addLog({
       name: saveSuccess ? 'Successful save' : 'Failed save',
diff --git a/app/imports/api/engine/actions/doCheck.js b/app/imports/api/engine/actions/doCheck.js
index a5bc653b..8e9789a6 100644
--- a/app/imports/api/engine/actions/doCheck.js
+++ b/app/imports/api/engine/actions/doCheck.js
@@ -4,7 +4,7 @@ import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import rollDice from '/imports/parser/rollDice.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '/imports/api/utility/numberToSignedString.js';
 import { applyTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 import ActionContext from '/imports/api/engine/actions/ActionContext.js';
 import evaluateCalculation from '/imports/api/engine/computation/utility/evaluateCalculation.js';
diff --git a/app/imports/api/library/methods/copyLibraryNodeTo.js b/app/imports/api/library/methods/copyLibraryNodeTo.js
index f99b184f..ea9ce06f 100644
--- a/app/imports/api/library/methods/copyLibraryNodeTo.js
+++ b/app/imports/api/library/methods/copyLibraryNodeTo.js
@@ -17,7 +17,7 @@ import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
 var snackbar;
 if (Meteor.isClient) {
   snackbar = require(
-    '/imports/ui/components/snackbars/SnackbarQueue.js'
+    '/imports/client/ui/components/snackbars/SnackbarQueue.js'
   ).snackbar
 }
 
diff --git a/app/imports/api/library/methods/duplicateLibraryNode.js b/app/imports/api/library/methods/duplicateLibraryNode.js
index ff35b8fb..83f20106 100644
--- a/app/imports/api/library/methods/duplicateLibraryNode.js
+++ b/app/imports/api/library/methods/duplicateLibraryNode.js
@@ -12,7 +12,7 @@ import { reorderDocs } from '/imports/api/parenting/order.js';
 var snackbar;
 if (Meteor.isClient) {
   snackbar = require(
-    '/imports/ui/components/snackbars/SnackbarQueue.js'
+    '/imports/client/ui/components/snackbars/SnackbarQueue.js'
   ).snackbar
 }
 
diff --git a/app/imports/ui/utility/numberToSignedString.js b/app/imports/api/utility/numberToSignedString.js
similarity index 100%
rename from app/imports/ui/utility/numberToSignedString.js
rename to app/imports/api/utility/numberToSignedString.js
diff --git a/app/imports/ui/components/CardHighlight.vue b/app/imports/client/ui/components/CardHighlight.vue
similarity index 100%
rename from app/imports/ui/components/CardHighlight.vue
rename to app/imports/client/ui/components/CardHighlight.vue
diff --git a/app/imports/ui/components/CoinValue.vue b/app/imports/client/ui/components/CoinValue.vue
similarity index 89%
rename from app/imports/ui/components/CoinValue.vue
rename to app/imports/client/ui/components/CoinValue.vue
index b13aa9ef..d5ccc0f8 100644
--- a/app/imports/ui/components/CoinValue.vue
+++ b/app/imports/client/ui/components/CoinValue.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script lang="js">
-import valueToCoins from '/imports/ui/utility/valueToCoins.js';
+import valueToCoins from '/imports/client/ui/utility/valueToCoins.js';
 
 export default {
   props:{
diff --git a/app/imports/ui/components/ColorPicker.vue b/app/imports/client/ui/components/ColorPicker.vue
similarity index 97%
rename from app/imports/ui/components/ColorPicker.vue
rename to app/imports/client/ui/components/ColorPicker.vue
index cc1423bd..92f304fe 100644
--- a/app/imports/ui/components/ColorPicker.vue
+++ b/app/imports/client/ui/components/ColorPicker.vue
@@ -99,9 +99,9 @@
 </template>
 
 <script lang="js">
-  import isDarkColor from '/imports/ui/utility/isDarkColor.js';
+  import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
   import vuetifyColors from 'vuetify/es5/util/colors';
-  import { kebabToCamelCase, camelToKebabCase } from '/imports/ui/utility/swapCase.js';
+  import { kebabToCamelCase, camelToKebabCase } from '/imports/client/ui/utility/swapCase.js';
 
   function colorToHex(color, shade = 'base'){
     if (!color) return;
diff --git a/app/imports/ui/components/ColumnLayout.vue b/app/imports/client/ui/components/ColumnLayout.vue
similarity index 100%
rename from app/imports/ui/components/ColumnLayout.vue
rename to app/imports/client/ui/components/ColumnLayout.vue
diff --git a/app/imports/ui/components/HorizontalHex.vue b/app/imports/client/ui/components/HorizontalHex.vue
similarity index 100%
rename from app/imports/ui/components/HorizontalHex.vue
rename to app/imports/client/ui/components/HorizontalHex.vue
diff --git a/app/imports/ui/components/ImageUploadInput.vue b/app/imports/client/ui/components/ImageUploadInput.vue
similarity index 100%
rename from app/imports/ui/components/ImageUploadInput.vue
rename to app/imports/client/ui/components/ImageUploadInput.vue
diff --git a/app/imports/ui/components/IncrementButton.vue b/app/imports/client/ui/components/IncrementButton.vue
similarity index 93%
rename from app/imports/ui/components/IncrementButton.vue
rename to app/imports/client/ui/components/IncrementButton.vue
index 865ec7bb..62c3768d 100644
--- a/app/imports/ui/components/IncrementButton.vue
+++ b/app/imports/client/ui/components/IncrementButton.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script lang="js">
-import IncrementMenu from '/imports/ui/components/IncrementMenu.vue';
+import IncrementMenu from '/imports/client/ui/components/IncrementMenu.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/components/IncrementMenu.vue b/app/imports/client/ui/components/IncrementMenu.vue
similarity index 100%
rename from app/imports/ui/components/IncrementMenu.vue
rename to app/imports/client/ui/components/IncrementMenu.vue
diff --git a/app/imports/ui/components/LabeledFab.vue b/app/imports/client/ui/components/LabeledFab.vue
similarity index 100%
rename from app/imports/ui/components/LabeledFab.vue
rename to app/imports/client/ui/components/LabeledFab.vue
diff --git a/app/imports/ui/components/MarkdownText.vue b/app/imports/client/ui/components/MarkdownText.vue
similarity index 100%
rename from app/imports/ui/components/MarkdownText.vue
rename to app/imports/client/ui/components/MarkdownText.vue
diff --git a/app/imports/ui/components/ResetSelector.vue b/app/imports/client/ui/components/ResetSelector.vue
similarity index 89%
rename from app/imports/ui/components/ResetSelector.vue
rename to app/imports/client/ui/components/ResetSelector.vue
index a9248ec8..c61e426a 100644
--- a/app/imports/ui/components/ResetSelector.vue
+++ b/app/imports/client/ui/components/ResetSelector.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script lang="js">
-import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js';
+import createListOfProperties from '/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js';
 
 export default {
   props: {
diff --git a/app/imports/ui/components/RollPopup.vue b/app/imports/client/ui/components/RollPopup.vue
similarity index 97%
rename from app/imports/ui/components/RollPopup.vue
rename to app/imports/client/ui/components/RollPopup.vue
index 0167bc1d..f9f20f66 100644
--- a/app/imports/ui/components/RollPopup.vue
+++ b/app/imports/client/ui/components/RollPopup.vue
@@ -64,7 +64,7 @@
 </template>
 
 <script lang="js">
-import VerticalHex from '/imports/ui/components/VerticalHex.vue';
+import VerticalHex from '/imports/client/ui/components/VerticalHex.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/components/SharedIcon.vue b/app/imports/client/ui/components/SharedIcon.vue
similarity index 100%
rename from app/imports/ui/components/SharedIcon.vue
rename to app/imports/client/ui/components/SharedIcon.vue
diff --git a/app/imports/ui/components/ToolbarCard.vue b/app/imports/client/ui/components/ToolbarCard.vue
similarity index 89%
rename from app/imports/ui/components/ToolbarCard.vue
rename to app/imports/client/ui/components/ToolbarCard.vue
index 9187bdf9..f9447a29 100644
--- a/app/imports/ui/components/ToolbarCard.vue
+++ b/app/imports/client/ui/components/ToolbarCard.vue
@@ -27,9 +27,9 @@
 </template>
 
 <script lang="js">
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
-import getThemeColor from '/imports/ui/utility/getThemeColor.js';
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
+import getThemeColor from '/imports/client/ui/utility/getThemeColor.js';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/components/TreeDetailLayout.vue b/app/imports/client/ui/components/TreeDetailLayout.vue
similarity index 100%
rename from app/imports/ui/components/TreeDetailLayout.vue
rename to app/imports/client/ui/components/TreeDetailLayout.vue
diff --git a/app/imports/ui/components/VerticalHex.vue b/app/imports/client/ui/components/VerticalHex.vue
similarity index 100%
rename from app/imports/ui/components/VerticalHex.vue
rename to app/imports/client/ui/components/VerticalHex.vue
diff --git a/app/imports/ui/components/global/DatePicker.vue b/app/imports/client/ui/components/global/DatePicker.vue
similarity index 92%
rename from app/imports/ui/components/global/DatePicker.vue
rename to app/imports/client/ui/components/global/DatePicker.vue
index ea56e034..0901143e 100644
--- a/app/imports/ui/components/global/DatePicker.vue
+++ b/app/imports/client/ui/components/global/DatePicker.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script lang="js">
-import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 import { format } from 'date-fns';
 
 export default {
diff --git a/app/imports/ui/components/global/IconPicker.vue b/app/imports/client/ui/components/global/IconPicker.vue
similarity index 94%
rename from app/imports/ui/components/global/IconPicker.vue
rename to app/imports/client/ui/components/global/IconPicker.vue
index 13ef7954..02a4f878 100644
--- a/app/imports/ui/components/global/IconPicker.vue
+++ b/app/imports/client/ui/components/global/IconPicker.vue
@@ -78,8 +78,8 @@
 </template>
 
 <script lang="js">
-import SvgIcon from '/imports/ui/components/global/SvgIcon.vue';
-import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+import SvgIcon from '/imports/client/ui/components/global/SvgIcon.vue';
+import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 import { findIcons } from '/imports/api/icons/Icons.js';
 
 export default {
diff --git a/app/imports/ui/components/global/SmartBtn.vue b/app/imports/client/ui/components/global/SmartBtn.vue
similarity index 94%
rename from app/imports/ui/components/global/SmartBtn.vue
rename to app/imports/client/ui/components/global/SmartBtn.vue
index 324fcf3e..219824ff 100644
--- a/app/imports/ui/components/global/SmartBtn.vue
+++ b/app/imports/client/ui/components/global/SmartBtn.vue
@@ -11,7 +11,7 @@
 
 <script lang="js">
 import { debounce } from 'lodash';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   inject: {
diff --git a/app/imports/ui/components/global/SmartCheckbox.vue b/app/imports/client/ui/components/global/SmartCheckbox.vue
similarity index 77%
rename from app/imports/ui/components/global/SmartCheckbox.vue
rename to app/imports/client/ui/components/global/SmartCheckbox.vue
index adc12c91..66cc572e 100644
--- a/app/imports/ui/components/global/SmartCheckbox.vue
+++ b/app/imports/client/ui/components/global/SmartCheckbox.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script lang="js">
-  import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+  import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
   export default {
     mixins: [SmartInput],
diff --git a/app/imports/ui/components/global/SmartCombobox.vue b/app/imports/client/ui/components/global/SmartCombobox.vue
similarity index 93%
rename from app/imports/ui/components/global/SmartCombobox.vue
rename to app/imports/client/ui/components/global/SmartCombobox.vue
index d5c985c0..99312f2d 100644
--- a/app/imports/ui/components/global/SmartCombobox.vue
+++ b/app/imports/client/ui/components/global/SmartCombobox.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script lang="js">
-import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
 export default {
   mixins: [SmartInput],
diff --git a/app/imports/ui/components/global/SmartInputMixin.js b/app/imports/client/ui/components/global/SmartInputMixin.js
similarity index 100%
rename from app/imports/ui/components/global/SmartInputMixin.js
rename to app/imports/client/ui/components/global/SmartInputMixin.js
diff --git a/app/imports/ui/components/global/SmartSelect.vue b/app/imports/client/ui/components/global/SmartSelect.vue
similarity index 86%
rename from app/imports/ui/components/global/SmartSelect.vue
rename to app/imports/client/ui/components/global/SmartSelect.vue
index 005ea2ae..7e24d3b9 100644
--- a/app/imports/ui/components/global/SmartSelect.vue
+++ b/app/imports/client/ui/components/global/SmartSelect.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script lang="js">
-import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
 export default {
   mixins: [SmartInput],
diff --git a/app/imports/ui/components/global/SmartSlider.vue b/app/imports/client/ui/components/global/SmartSlider.vue
similarity index 88%
rename from app/imports/ui/components/global/SmartSlider.vue
rename to app/imports/client/ui/components/global/SmartSlider.vue
index b9797d9b..5889b16d 100644
--- a/app/imports/ui/components/global/SmartSlider.vue
+++ b/app/imports/client/ui/components/global/SmartSlider.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script lang="js">
-  import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+  import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
   export default {
     mixins: [SmartInput],
diff --git a/app/imports/ui/components/global/SmartSwitch.vue b/app/imports/client/ui/components/global/SmartSwitch.vue
similarity index 77%
rename from app/imports/ui/components/global/SmartSwitch.vue
rename to app/imports/client/ui/components/global/SmartSwitch.vue
index 716e0998..a0ce5668 100644
--- a/app/imports/ui/components/global/SmartSwitch.vue
+++ b/app/imports/client/ui/components/global/SmartSwitch.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script lang="js">
-  import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+  import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
   export default {
     mixins: [SmartInput],
diff --git a/app/imports/ui/components/global/SvgIcon.vue b/app/imports/client/ui/components/global/SvgIcon.vue
similarity index 100%
rename from app/imports/ui/components/global/SvgIcon.vue
rename to app/imports/client/ui/components/global/SvgIcon.vue
diff --git a/app/imports/ui/components/global/TextArea.vue b/app/imports/client/ui/components/global/TextArea.vue
similarity index 84%
rename from app/imports/ui/components/global/TextArea.vue
rename to app/imports/client/ui/components/global/TextArea.vue
index 2fe4f8c8..2ab49142 100644
--- a/app/imports/ui/components/global/TextArea.vue
+++ b/app/imports/client/ui/components/global/TextArea.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="js">
-import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
 export default {
   mixins: [SmartInput],
diff --git a/app/imports/ui/components/global/TextField.vue b/app/imports/client/ui/components/global/TextField.vue
similarity index 88%
rename from app/imports/ui/components/global/TextField.vue
rename to app/imports/client/ui/components/global/TextField.vue
index 9c9f0919..283f5c01 100644
--- a/app/imports/ui/components/global/TextField.vue
+++ b/app/imports/client/ui/components/global/TextField.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script lang="js">
-  import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+  import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
   export default {
     mixins: [SmartInput],
diff --git a/app/imports/client/ui/components/global/globalIndex.js b/app/imports/client/ui/components/global/globalIndex.js
new file mode 100644
index 00000000..bb0898d5
--- /dev/null
+++ b/app/imports/client/ui/components/global/globalIndex.js
@@ -0,0 +1,25 @@
+import Vue from 'vue';
+// Global components
+import DatePicker from '/imports/client/ui/components/global/DatePicker.vue';
+import IconPicker from '/imports/client/ui/components/global/IconPicker.vue';
+import TextField from '/imports/client/ui/components/global/TextField.vue';
+import TextArea from '/imports/client/ui/components/global/TextArea.vue';
+import SmartSelect from '/imports/client/ui/components/global/SmartSelect.vue';
+import SmartBtn from '/imports/client/ui/components/global/SmartBtn.vue';
+import SmartCombobox from '/imports/client/ui/components/global/SmartCombobox.vue';
+import SmartCheckbox from '/imports/client/ui/components/global/SmartCheckbox.vue';
+import SmartSwitch from '/imports/client/ui/components/global/SmartSwitch.vue';
+import SvgIcon from '/imports/client/ui/components/global/SvgIcon.vue';
+import SmartSlider from '/imports/client/ui/components/global/SmartSlider.vue';
+
+Vue.component('DatePicker', DatePicker);
+Vue.component('IconPicker', IconPicker);
+Vue.component('TextField', TextField);
+Vue.component('TextArea', TextArea);
+Vue.component('SmartSelect', SmartSelect);
+Vue.component('SmartBtn', SmartBtn);
+Vue.component('SmartCombobox', SmartCombobox);
+Vue.component('SmartCheckbox', SmartCheckbox);
+Vue.component('SmartSlider', SmartSlider);
+Vue.component('SmartSwitch', SmartSwitch);
+Vue.component('SvgIcon', SvgIcon);
diff --git a/app/imports/ui/components/propertyToolbar.vue b/app/imports/client/ui/components/propertyToolbar.vue
similarity index 95%
rename from app/imports/ui/components/propertyToolbar.vue
rename to app/imports/client/ui/components/propertyToolbar.vue
index af6ba016..7743f685 100644
--- a/app/imports/ui/components/propertyToolbar.vue
+++ b/app/imports/client/ui/components/propertyToolbar.vue
@@ -162,11 +162,11 @@
 </template>
 
 <script lang="js">
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import ColorPicker from '/imports/ui/components/ColorPicker.vue';
-import getThemeColor from '/imports/ui/utility/getThemeColor.js';
+import ColorPicker from '/imports/client/ui/components/ColorPicker.vue';
+import getThemeColor from '/imports/client/ui/utility/getThemeColor.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/components/rolls/Check.vue b/app/imports/client/ui/components/rolls/Check.vue
similarity index 96%
rename from app/imports/ui/components/rolls/Check.vue
rename to app/imports/client/ui/components/rolls/Check.vue
index 19103522..2fb95d8f 100644
--- a/app/imports/ui/components/rolls/Check.vue
+++ b/app/imports/client/ui/components/rolls/Check.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '../../../../api/utility/numberToSignedString.js';
 export default {
   props: {
     attributeVarName: {
diff --git a/app/imports/ui/components/snackbars/SnackbarQueue.js b/app/imports/client/ui/components/snackbars/SnackbarQueue.js
similarity index 100%
rename from app/imports/ui/components/snackbars/SnackbarQueue.js
rename to app/imports/client/ui/components/snackbars/SnackbarQueue.js
diff --git a/app/imports/ui/components/snackbars/SnackbarQueue.vue b/app/imports/client/ui/components/snackbars/SnackbarQueue.vue
similarity index 95%
rename from app/imports/ui/components/snackbars/SnackbarQueue.vue
rename to app/imports/client/ui/components/snackbars/SnackbarQueue.vue
index 78a6c550..7f3eecf7 100644
--- a/app/imports/ui/components/snackbars/SnackbarQueue.vue
+++ b/app/imports/client/ui/components/snackbars/SnackbarQueue.vue
@@ -40,8 +40,8 @@
 
 <script lang="js">
 // Modified from https://gitlab.com/tozd/vue/snackbar-queue
-import { globalState } from '/imports/ui/components/snackbars/SnackbarQueue.js';
-import LogContent from '/imports/ui/log/LogContent.vue';
+import { globalState } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+import LogContent from '/imports/client/ui/log/LogContent.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/components/tree/TreeNode.vue b/app/imports/client/ui/components/tree/TreeNode.vue
similarity index 98%
rename from app/imports/ui/components/tree/TreeNode.vue
rename to app/imports/client/ui/components/tree/TreeNode.vue
index c17b435a..2a8ee46e 100644
--- a/app/imports/ui/components/tree/TreeNode.vue
+++ b/app/imports/client/ui/components/tree/TreeNode.vue
@@ -85,7 +85,7 @@
 **/
 import { canBeParent } from '/imports/api/parenting/parenting.js';
 import { getPropertyIcon } from '/imports/constants/PROPERTIES.js';
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
 import { some } from 'lodash';
 
 export default {
diff --git a/app/imports/ui/components/tree/TreeNodeList.vue b/app/imports/client/ui/components/tree/TreeNodeList.vue
similarity index 98%
rename from app/imports/ui/components/tree/TreeNodeList.vue
rename to app/imports/client/ui/components/tree/TreeNodeList.vue
index 1ea59678..71925cac 100644
--- a/app/imports/ui/components/tree/TreeNodeList.vue
+++ b/app/imports/client/ui/components/tree/TreeNodeList.vue
@@ -34,7 +34,7 @@
 
 <script lang="js">
 import draggable from 'vuedraggable';
-import TreeNode from '/imports/ui/components/tree/TreeNode.vue';
+import TreeNode from '/imports/client/ui/components/tree/TreeNode.vue';
 import { isParentAllowed } from '/imports/api/parenting/parenting.js';
 
 export default {
diff --git a/app/imports/ui/components/tree/TreeSearchInput.vue b/app/imports/client/ui/components/tree/TreeSearchInput.vue
similarity index 100%
rename from app/imports/ui/components/tree/TreeSearchInput.vue
rename to app/imports/client/ui/components/tree/TreeSearchInput.vue
diff --git a/app/imports/ui/creature/CreatureForm.vue b/app/imports/client/ui/creature/CreatureForm.vue
similarity index 98%
rename from app/imports/ui/creature/CreatureForm.vue
rename to app/imports/client/ui/creature/CreatureForm.vue
index 1fdc4073..d0752e73 100644
--- a/app/imports/ui/creature/CreatureForm.vue
+++ b/app/imports/client/ui/creature/CreatureForm.vue
@@ -126,8 +126,8 @@
 
 <script lang="js">
 import { union, without, debounce } from 'lodash';
-import FormSection, { FormSections } from '/imports/ui/properties/forms/shared/FormSection.vue';
-import LibraryList from '/imports/ui/library/LibraryList.vue';
+import FormSection, { FormSections } from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import LibraryList from '/imports/client/ui/library/LibraryList.vue';
 import LibraryCollections from '/imports/api/library/LibraryCollections.js';
 import { changeAllowedLibraries, toggleAllUserLibraries } from '/imports/api/creature/creatures/methods/changeAllowedLibraries.js';
 
diff --git a/app/imports/ui/creature/CreatureFormDialog.vue b/app/imports/client/ui/creature/CreatureFormDialog.vue
similarity index 89%
rename from app/imports/ui/creature/CreatureFormDialog.vue
rename to app/imports/client/ui/creature/CreatureFormDialog.vue
index 04fa4d19..f3f3a058 100644
--- a/app/imports/ui/creature/CreatureFormDialog.vue
+++ b/app/imports/client/ui/creature/CreatureFormDialog.vue
@@ -34,10 +34,10 @@
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import updateCreature from '/imports/api/creature/creatures/methods/updateCreature.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import CreatureForm from '/imports/ui/creature/CreatureForm.vue'
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import CreatureForm from '/imports/client/ui/creature/CreatureForm.vue'
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
-import ColorPicker from '/imports/ui/components/ColorPicker.vue';
+import ColorPicker from '/imports/client/ui/components/ColorPicker.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/RestButton.vue b/app/imports/client/ui/creature/RestButton.vue
similarity index 100%
rename from app/imports/ui/creature/RestButton.vue
rename to app/imports/client/ui/creature/RestButton.vue
diff --git a/app/imports/ui/creature/archive/ArchiveDialog.vue b/app/imports/client/ui/creature/archive/ArchiveDialog.vue
similarity index 95%
rename from app/imports/ui/creature/archive/ArchiveDialog.vue
rename to app/imports/client/ui/creature/archive/ArchiveDialog.vue
index 5d5b041d..bfdd60a8 100644
--- a/app/imports/ui/creature/archive/ArchiveDialog.vue
+++ b/app/imports/client/ui/creature/archive/ArchiveDialog.vue
@@ -57,14 +57,14 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
-import CreatureFolderList from '/imports/ui/creature/creatureList/CreatureFolderList.vue';
+import CreatureFolderList from '/imports/client/ui/creature/creatureList/CreatureFolderList.vue';
 import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
 import archiveCreatureToFile from '/imports/api/creature/archive/methods/archiveCreatureToFile.js';
 import restoreCreatureFromFile from '/imports/api/creature/archive/methods/restoreCreatureFromFile.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import { uniq, flatten } from 'lodash';
 import { characterSlotsRemaining } from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
 
diff --git a/app/imports/ui/creature/buildTree/BuildTreeNode.vue b/app/imports/client/ui/creature/buildTree/BuildTreeNode.vue
similarity index 95%
rename from app/imports/ui/creature/buildTree/BuildTreeNode.vue
rename to app/imports/client/ui/creature/buildTree/BuildTreeNode.vue
index ca359bf2..853d79cf 100644
--- a/app/imports/ui/creature/buildTree/BuildTreeNode.vue
+++ b/app/imports/client/ui/creature/buildTree/BuildTreeNode.vue
@@ -123,13 +123,13 @@
 * the tree view shows off the full character structure, and where each part of
 * character comes from.
 **/
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-import FillSlotButton from '/imports/ui/creature/buildTree/FillSlotButton.vue';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
+import FillSlotButton from '/imports/client/ui/creature/buildTree/FillSlotButton.vue';
 import { some } from 'lodash';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import softRemoveProperty from '/imports/api/creature/creatureProperties/methods/softRemoveProperty.js';
 import restoreProperty from '/imports/api/creature/creatureProperties/methods/restoreProperty.js';
-import getPropertyTitle from '/imports/ui/properties/shared/getPropertyTitle.js';
+import getPropertyTitle from '/imports/client/ui/properties/shared/getPropertyTitle.js';
 
 export default {
   name: 'BuildTreeNode',
diff --git a/app/imports/ui/creature/buildTree/BuildTreeNodeList.vue b/app/imports/client/ui/creature/buildTree/BuildTreeNodeList.vue
similarity index 87%
rename from app/imports/ui/creature/buildTree/BuildTreeNodeList.vue
rename to app/imports/client/ui/creature/buildTree/BuildTreeNodeList.vue
index 852de655..9a8aa35b 100644
--- a/app/imports/ui/creature/buildTree/BuildTreeNodeList.vue
+++ b/app/imports/client/ui/creature/buildTree/BuildTreeNodeList.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="js">
-import BuildTreeNode from '/imports/ui/creature/buildTree/BuildTreeNode.vue';
+import BuildTreeNode from '/imports/client/ui/creature/buildTree/BuildTreeNode.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/buildTree/FillSlotButton.vue b/app/imports/client/ui/creature/buildTree/FillSlotButton.vue
similarity index 100%
rename from app/imports/ui/creature/buildTree/FillSlotButton.vue
rename to app/imports/client/ui/creature/buildTree/FillSlotButton.vue
diff --git a/app/imports/ui/creature/character/CharacterCreationDialog.vue b/app/imports/client/ui/creature/character/CharacterCreationDialog.vue
similarity index 96%
rename from app/imports/ui/creature/character/CharacterCreationDialog.vue
rename to app/imports/client/ui/creature/character/CharacterCreationDialog.vue
index 17fca049..001f8a64 100644
--- a/app/imports/ui/creature/character/CharacterCreationDialog.vue
+++ b/app/imports/client/ui/creature/character/CharacterCreationDialog.vue
@@ -110,11 +110,11 @@
 </template>
 
 <script lang="js">
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import { defer, union, without } from 'lodash';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import insertCreature from '/imports/api/creature/creatures/methods/insertCreature.js';
-import LibraryList from '/imports/ui/library/LibraryList.vue';
+import LibraryList from '/imports/client/ui/library/LibraryList.vue';
 import LibraryCollections from '/imports/api/library/LibraryCollections.js';
 
 export default {
diff --git a/app/imports/ui/creature/character/CharacterDeleteDialog.vue b/app/imports/client/ui/creature/character/CharacterDeleteDialog.vue
similarity index 91%
rename from app/imports/ui/creature/character/CharacterDeleteDialog.vue
rename to app/imports/client/ui/creature/character/CharacterDeleteDialog.vue
index 7021d2a7..774d6e57 100644
--- a/app/imports/ui/creature/character/CharacterDeleteDialog.vue
+++ b/app/imports/client/ui/creature/character/CharacterDeleteDialog.vue
@@ -32,9 +32,9 @@
 
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import removeCreature from '/imports/api/creature/creatures/methods/removeCreature.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/CharacterSheet.vue b/app/imports/client/ui/creature/character/CharacterSheet.vue
similarity index 85%
rename from app/imports/ui/creature/character/CharacterSheet.vue
rename to app/imports/client/ui/creature/character/CharacterSheet.vue
index e2e225cc..c9658c6d 100644
--- a/app/imports/ui/creature/character/CharacterSheet.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheet.vue
@@ -75,16 +75,16 @@
 //TODO add a "no character found" screen if shown on a false address
 // or on a character the user does not have permission to view
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import StatsTab from '/imports/ui/creature/character/characterSheetTabs/StatsTab.vue';
-import FeaturesTab from '/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue';
-import InventoryTab from '/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue';
-import SpellsTab from '/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue';
-import CharacterTab from '/imports/ui/creature/character/characterSheetTabs/JournalTab.vue';
-import BuildTab from '/imports/ui/creature/character/characterSheetTabs/BuildTab.vue';
-import TreeTab from '/imports/ui/creature/character/characterSheetTabs/TreeTab.vue';
+import StatsTab from '/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue';
+import FeaturesTab from '/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue';
+import InventoryTab from '/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue';
+import SpellsTab from '/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue';
+import CharacterTab from '/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue';
+import BuildTab from '/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue';
+import TreeTab from '/imports/client/ui/creature/character/characterSheetTabs/TreeTab.vue';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/CharacterSheetFab.vue b/app/imports/client/ui/creature/character/CharacterSheetFab.vue
similarity index 98%
rename from app/imports/ui/creature/character/CharacterSheetFab.vue
rename to app/imports/client/ui/creature/character/CharacterSheetFab.vue
index 5af7abd0..8381cab7 100644
--- a/app/imports/ui/creature/character/CharacterSheetFab.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheetFab.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script lang="js">
-  import LabeledFab from '/imports/ui/components/LabeledFab.vue';
+  import LabeledFab from '/imports/client/ui/components/LabeledFab.vue';
   import { getHighestOrder } from '/imports/api/parenting/order.js';
   import insertProperty from '/imports/api/creature/creatureProperties/methods/insertProperty.js';
   import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
diff --git a/app/imports/ui/creature/character/CharacterSheetRightDrawer.vue b/app/imports/client/ui/creature/character/CharacterSheetRightDrawer.vue
similarity index 88%
rename from app/imports/ui/creature/character/CharacterSheetRightDrawer.vue
rename to app/imports/client/ui/creature/character/CharacterSheetRightDrawer.vue
index bb2056e4..4957bcb4 100644
--- a/app/imports/ui/creature/character/CharacterSheetRightDrawer.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheetRightDrawer.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script lang="js">
-import CharacterLog from '/imports/ui/log/CharacterLog.vue';
+import CharacterLog from '/imports/client/ui/log/CharacterLog.vue';
 export default {
   components: {
     CharacterLog,
diff --git a/app/imports/ui/creature/character/CharacterSheetToolbar.vue b/app/imports/client/ui/creature/character/CharacterSheetToolbar.vue
similarity index 95%
rename from app/imports/ui/creature/character/CharacterSheetToolbar.vue
rename to app/imports/client/ui/creature/character/CharacterSheetToolbar.vue
index 0fb36161..7b81f6cd 100644
--- a/app/imports/ui/creature/character/CharacterSheetToolbar.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheetToolbar.vue
@@ -133,10 +133,10 @@ import removeCreature from '/imports/api/creature/creatures/methods/removeCreatu
 import { mapMutations } from 'vuex';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { updateUserSharePermissions } from '/imports/api/sharing/sharing.js';
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
-import CharacterSheetFab from '/imports/ui/creature/character/CharacterSheetFab.vue';
-import getThemeColor from '/imports/ui/utility/getThemeColor.js';
-import SharedIcon from '/imports/ui/components/SharedIcon.vue';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
+import CharacterSheetFab from '/imports/client/ui/creature/character/CharacterSheetFab.vue';
+import getThemeColor from '/imports/client/ui/utility/getThemeColor.js';
+import SharedIcon from '/imports/client/ui/components/SharedIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/CreatureRootDialog.vue b/app/imports/client/ui/creature/character/CreatureRootDialog.vue
similarity index 91%
rename from app/imports/ui/creature/character/CreatureRootDialog.vue
rename to app/imports/client/ui/creature/character/CreatureRootDialog.vue
index 9d9ecffe..18cdd730 100644
--- a/app/imports/ui/creature/character/CreatureRootDialog.vue
+++ b/app/imports/client/ui/creature/character/CreatureRootDialog.vue
@@ -65,12 +65,12 @@
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import PropertyToolbar from '/imports/ui/components/propertyToolbar.vue';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import PropertyToolbar from '/imports/client/ui/components/propertyToolbar.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
-import propertyViewerIndex from '/imports/ui/properties/viewers/shared/propertyViewerIndex.js';
-import CreaturePropertiesTree from '/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
+import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
+import propertyViewerIndex from '/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js';
+import CreaturePropertiesTree from '/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { getHighestOrder } from '/imports/api/parenting/order.js';
 import insertProperty from '/imports/api/creature/creatureProperties/methods/insertProperty.js';
diff --git a/app/imports/ui/creature/character/CreatureSummary.vue b/app/imports/client/ui/creature/character/CreatureSummary.vue
similarity index 92%
rename from app/imports/ui/creature/character/CreatureSummary.vue
rename to app/imports/client/ui/creature/character/CreatureSummary.vue
index 4ec23aa3..f4899884 100644
--- a/app/imports/ui/creature/character/CreatureSummary.vue
+++ b/app/imports/client/ui/creature/character/CreatureSummary.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script lang="js">
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/MiniCharacterSheet.vue b/app/imports/client/ui/creature/character/MiniCharacterSheet.vue
similarity index 100%
rename from app/imports/ui/creature/character/MiniCharacterSheet.vue
rename to app/imports/client/ui/creature/character/MiniCharacterSheet.vue
diff --git a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue
similarity index 95%
rename from app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue
index b4e4d9a4..8e6881e5 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue
@@ -182,14 +182,14 @@
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
-import BuildTreeNodeList from '/imports/ui/creature/buildTree/BuildTreeNodeList.vue';
-import SlotCardsToFill from '/imports/ui/creature/slots/SlotCardsToFill.vue';
-import CreatureVariables from '../../../../api/creature/creatures/CreatureVariables';
+import BuildTreeNodeList from '/imports/client/ui/creature/buildTree/BuildTreeNodeList.vue';
+import SlotCardsToFill from '/imports/client/ui/creature/slots/SlotCardsToFill.vue';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
-import CharacterErrors from '/imports/ui/creature/character/errors/CharacterErrors.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import CharacterErrors from '/imports/client/ui/creature/character/errors/CharacterErrors.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
-import getPropertyTitle from '/imports/ui/properties/shared/getPropertyTitle.js';
+import getPropertyTitle from '/imports/client/ui/properties/shared/getPropertyTitle.js';
 
 function traverse(tree, callback, parents = []){
   tree.forEach(node => {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
similarity index 87%
rename from app/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
index c1bfc215..8630a938 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
@@ -17,8 +17,8 @@
 
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import FeatureCard from '/imports/ui/properties/components/features/FeatureCard.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
+import FeatureCard from '/imports/client/ui/properties/components/features/FeatureCard.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
similarity index 92%
rename from app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
index ea77fddd..b78e0d73 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
@@ -92,15 +92,15 @@
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import ContainerCard from '/imports/ui/properties/components/inventory/ContainerCard.vue';
-import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
-import ItemList from '/imports/ui/properties/components/inventory/ItemList.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
+import ContainerCard from '/imports/client/ui/properties/components/inventory/ContainerCard.vue';
+import ToolbarCard from '/imports/client/ui/components/ToolbarCard.vue';
+import ItemList from '/imports/client/ui/properties/components/inventory/ItemList.vue';
 import getParentRefByTag from '/imports/api/creature/creatureProperties/methods/getParentRefByTag.js';
 import BUILT_IN_TAGS from '/imports/constants/BUILT_IN_TAGS.js';
-import CoinValue from '/imports/ui/components/CoinValue.vue';
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
-import CreatureVariables from '../../../../api/creature/creatures/CreatureVariables';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
similarity index 80%
rename from app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
index f37e7b5b..4bc52058 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
@@ -17,10 +17,10 @@
 </template>
 
 <script lang="js">
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import NoteCard from '/imports/ui/properties/components/persona/NoteCard.vue';
-import CreatureSummary from '/imports/ui/creature/character/CreatureSummary.vue';
+import NoteCard from '/imports/client/ui/properties/components/persona/NoteCard.vue';
+import CreatureSummary from '/imports/client/ui/creature/character/CreatureSummary.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 
 export default {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
similarity index 89%
rename from app/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
index a5e307cc..14a5ff5c 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
@@ -23,10 +23,10 @@
 </template>
 
 <script lang="js">
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import SpellListCard from '/imports/ui/properties/components/spells/SpellListCard.vue';
-import SpellList from '/imports/ui/properties/components/spells/SpellList.vue';
+import SpellListCard from '/imports/client/ui/properties/components/spells/SpellListCard.vue';
+import SpellList from '/imports/client/ui/properties/components/spells/SpellList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
similarity index 91%
rename from app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
index ac9b3711..259001b7 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -1,6 +1,6 @@
 <template lang="html">
   <div class="stats-tab ma-2">
-    HMR TEST 2
+    HMR TEST 3
     <div
       v-if="healthBars.length"
       class="px-2 pt-2"
@@ -358,24 +358,24 @@
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import softRemoveProperty from '/imports/api/creature/creatureProperties/methods/softRemoveProperty.js';
 import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
-import HealthBar from '/imports/ui/properties/components/attributes/HealthBar.vue';
-import AttributeCard from '/imports/ui/properties/components/attributes/AttributeCard.vue';
-import AbilityListTile from '/imports/ui/properties/components/attributes/AbilityListTile.vue';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import DamageMultiplierCard from '/imports/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue';
-import HitDiceListTile from '/imports/ui/properties/components/attributes/HitDiceListTile.vue';
-import SkillListTile from '/imports/ui/properties/components/skills/SkillListTile.vue';
-import ResourceCard from '/imports/ui/properties/components/attributes/ResourceCard.vue';
-import SpellSlotListTile from '/imports/ui/properties/components/attributes/SpellSlotListTile.vue';
-import ActionCard from '/imports/ui/properties/components/actions/ActionCard.vue';
-import RestButton from '/imports/ui/creature/RestButton.vue';
+import HealthBar from '/imports/client/ui/properties/components/attributes/HealthBar.vue';
+import AttributeCard from '/imports/client/ui/properties/components/attributes/AttributeCard.vue';
+import AbilityListTile from '/imports/client/ui/properties/components/attributes/AbilityListTile.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
+import DamageMultiplierCard from '/imports/client/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue';
+import HitDiceListTile from '/imports/client/ui/properties/components/attributes/HitDiceListTile.vue';
+import SkillListTile from '/imports/client/ui/properties/components/skills/SkillListTile.vue';
+import ResourceCard from '/imports/client/ui/properties/components/attributes/ResourceCard.vue';
+import SpellSlotListTile from '/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue';
+import ActionCard from '/imports/client/ui/properties/components/actions/ActionCard.vue';
+import RestButton from '/imports/client/ui/creature/RestButton.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import ToggleCard from '/imports/ui/properties/components/toggles/ToggleCard.vue';
-import BuffListItem from '/imports/ui/properties/components/buffs/BuffListItem.vue';
+import ToggleCard from '/imports/client/ui/properties/components/toggles/ToggleCard.vue';
+import BuffListItem from '/imports/client/ui/properties/components/buffs/BuffListItem.vue';
 import doCastSpell from '/imports/api/engine/actions/doCastSpell.js';
-import EventButton from '/imports/ui/properties/components/actions/EventButton.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
-import FolderGroupCard from '/imports/ui/properties/components/folders/FolderGroupCard.vue';
+import EventButton from '/imports/client/ui/properties/components/actions/EventButton.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+import FolderGroupCard from '/imports/client/ui/properties/components/folders/FolderGroupCard.vue';
 import { uniqBy } from 'lodash';
 
 const getProperties = function (creature, folderIds, filter, options = {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/TreeTab.vue
similarity index 89%
rename from app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/TreeTab.vue
index ae2988fc..4d92e0b1 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/TreeTab.vue
@@ -54,10 +54,10 @@
 </template>
 
 <script lang="js">
-  import TreeDetailLayout from '/imports/ui/components/TreeDetailLayout.vue';
-  import CreaturePropertiesTree from '/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
-  import CreaturePropertyDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue';
-  import TreeSearchInput from '/imports/ui/components/tree/TreeSearchInput.vue';
+  import TreeDetailLayout from '/imports/client/ui/components/TreeDetailLayout.vue';
+  import CreaturePropertiesTree from '/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
+  import CreaturePropertyDialog from '/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue';
+  import TreeSearchInput from '/imports/client/ui/components/tree/TreeSearchInput.vue';
   import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
   import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 
diff --git a/app/imports/ui/creature/character/errors/CharacterErrors.vue b/app/imports/client/ui/creature/character/errors/CharacterErrors.vue
similarity index 95%
rename from app/imports/ui/creature/character/errors/CharacterErrors.vue
rename to app/imports/client/ui/creature/character/errors/CharacterErrors.vue
index d15963a9..130144f3 100644
--- a/app/imports/ui/creature/character/errors/CharacterErrors.vue
+++ b/app/imports/client/ui/creature/character/errors/CharacterErrors.vue
@@ -52,7 +52,7 @@
 
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import DependencyLoopError from '/imports/ui/creature/character/errors/DependencyLoopError.vue';
+import DependencyLoopError from '/imports/client/ui/creature/character/errors/DependencyLoopError.vue';
 import updateCreature from '/imports/api/creature/creatures/methods/updateCreature.js';
 
 export default {
diff --git a/app/imports/ui/creature/character/errors/DependencyLoopError.vue b/app/imports/client/ui/creature/character/errors/DependencyLoopError.vue
similarity index 96%
rename from app/imports/ui/creature/character/errors/DependencyLoopError.vue
rename to app/imports/client/ui/creature/character/errors/DependencyLoopError.vue
index d8e7d632..b324a74c 100644
--- a/app/imports/ui/creature/character/errors/DependencyLoopError.vue
+++ b/app/imports/client/ui/creature/character/errors/DependencyLoopError.vue
@@ -47,7 +47,7 @@
 
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
 import { reverse } from 'lodash';
 
 export default {
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
similarity index 96%
rename from app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
index 5a4c5b53..9fe2bec8 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
@@ -78,9 +78,9 @@
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import PrintedStats from '/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue';
-import PrintedInventory from '/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue';
-import PrintedSpells from '/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue';
+import PrintedStats from '/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue';
+import PrintedInventory from '/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue';
+import PrintedSpells from '/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import QrcodeVue from 'qrcode.vue'
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
similarity index 94%
rename from app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
index 53694a81..1e87f3f4 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
@@ -86,13 +86,13 @@
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
 import getParentRefByTag from '/imports/api/creature/creatureProperties/methods/getParentRefByTag.js';
 import BUILT_IN_TAGS from '/imports/constants/BUILT_IN_TAGS.js';
-import CoinValue from '/imports/ui/components/CoinValue.vue';
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
-import PrintedItem from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue';
-import PrintedContainer from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue';
+import PrintedItem from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue';
+import PrintedContainer from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue';
 import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 
 export default {
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
similarity index 89%
rename from app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
index 1d60374b..a8094314 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
@@ -38,10 +38,10 @@
 </template>
 
 <script lang="js">
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import PrintedSpell from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue';
-import PrintedSpellList from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue';
+import PrintedSpell from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue';
+import PrintedSpellList from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue
similarity index 95%
rename from app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue
index e3bad2a4..c307f7ea 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue
@@ -368,13 +368,13 @@
 
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import PrintedAction from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
+import PrintedAction from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import PrintedSkill from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue';
-import PrintedDamageMultipliers from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
+import PrintedSkill from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue';
+import PrintedDamageMultipliers from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
 
 const getProperties = function (creature, filter, options = {
   sort: { order: 1 }
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue
similarity index 91%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue
index 5f1adf07..abfbfeef 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue
@@ -78,12 +78,12 @@
 
 <script lang="js">
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import AttributeConsumedView from '/imports/ui/properties/components/actions/AttributeConsumedView.vue';
-import ItemConsumedView from '/imports/ui/properties/components/actions/ItemConsumedView.vue';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
-import TreeNodeList from '/imports/ui/components/tree/TreeNodeList.vue';
+import numberToSignedString from '../../../../../../api/utility/numberToSignedString.js';
+import AttributeConsumedView from '/imports/client/ui/properties/components/actions/AttributeConsumedView.vue';
+import ItemConsumedView from '/imports/client/ui/properties/components/actions/ItemConsumedView.vue';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
+import TreeNodeList from '/imports/client/ui/components/tree/TreeNodeList.vue';
 import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { some } from 'lodash';
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
similarity index 91%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
index a15ed8c8..2bb4adb9 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
@@ -97,10 +97,10 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
-import CoinValue from '/imports/ui/components/CoinValue.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
 
 export default {
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue
similarity index 100%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue
similarity index 93%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue
index ccc5b85d..4be30e77 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue
@@ -102,10 +102,10 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
-import CoinValue from '/imports/ui/components/CoinValue.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
 
 export default {
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue
similarity index 91%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue
index 2920634c..404da2aa 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue
@@ -46,8 +46,8 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
+import numberToSignedString from '../../../../../../api/utility/numberToSignedString.js';
+import ProficiencyIcon from '/imports/client/ui/properties/shared/ProficiencyIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue
similarity index 94%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue
index 8367c2a0..bc1fbc75 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script lang="js">
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
 
 const levelText = [
   'cantrip', '1st-level', '2nd-level', '3rd-level', '4th-level', '5th-level',
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
similarity index 89%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
index e158000f..4dbf8d14 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script lang="js">
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/creatureList/ArchiveButton.vue b/app/imports/client/ui/creature/creatureList/ArchiveButton.vue
similarity index 100%
rename from app/imports/ui/creature/creatureList/ArchiveButton.vue
rename to app/imports/client/ui/creature/creatureList/ArchiveButton.vue
diff --git a/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue b/app/imports/client/ui/creature/creatureList/CharacterListToolbarItems.vue
similarity index 56%
rename from app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
rename to app/imports/client/ui/creature/creatureList/CharacterListToolbarItems.vue
index df427b85..1dfb7105 100644
--- a/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
+++ b/app/imports/client/ui/creature/creatureList/CharacterListToolbarItems.vue
@@ -6,8 +6,8 @@
 </template>
 
 <script lang="js">
-import CreatureStorageStats from '/imports/ui/creature/creatureList/CreatureStorageStats.vue';
-import ArchiveButton from '/imports/ui/creature/creatureList/ArchiveButton.vue';
+import CreatureStorageStats from '/imports/client/ui/creature/creatureList/CreatureStorageStats.vue';
+import ArchiveButton from '/imports/client/ui/creature/creatureList/ArchiveButton.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue b/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue
similarity index 96%
rename from app/imports/ui/creature/creatureList/CreatureFolderHeader.vue
rename to app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue
index 3f826f6f..1b22dcdc 100644
--- a/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue
@@ -52,7 +52,7 @@
   import Vue from 'vue';
   import updateCreatureFolderName from '/imports/api/creature/creatureFolders/methods.js/updateCreatureFolderName.js';
   import removeCreatureFolder from '/imports/api/creature/creatureFolders/methods.js/removeCreatureFolder.js';
-  import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+  import {snackbar} from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
   export default {
     props: {
diff --git a/app/imports/ui/creature/creatureList/CreatureFolderList.vue b/app/imports/client/ui/creature/creatureList/CreatureFolderList.vue
similarity index 89%
rename from app/imports/ui/creature/creatureList/CreatureFolderList.vue
rename to app/imports/client/ui/creature/creatureList/CreatureFolderList.vue
index 8310e939..783e968d 100644
--- a/app/imports/ui/creature/creatureList/CreatureFolderList.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureFolderList.vue
@@ -37,8 +37,8 @@
 </template>
 
 <script lang="js">
-import CreatureFolderHeader from '/imports/ui/creature/creatureList/CreatureFolderHeader.vue';
-import CreatureList from '/imports/ui/creature/creatureList/CreatureList.vue';
+import CreatureFolderHeader from '/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue';
+import CreatureList from '/imports/client/ui/creature/creatureList/CreatureList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/creatureList/CreatureList.vue b/app/imports/client/ui/creature/creatureList/CreatureList.vue
similarity index 93%
rename from app/imports/ui/creature/creatureList/CreatureList.vue
rename to app/imports/client/ui/creature/creatureList/CreatureList.vue
index dac86161..dac17440 100644
--- a/app/imports/ui/creature/creatureList/CreatureList.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureList.vue
@@ -26,10 +26,10 @@
 </template>
 
 <script lang="js">
-  import CreatureListTile from '/imports/ui/creature/creatureList/CreatureListTile.vue';
+  import CreatureListTile from '/imports/client/ui/creature/creatureList/CreatureListTile.vue';
   import draggable from 'vuedraggable';
   import moveCreatureToFolder from '/imports/api/creature/creatureFolders/methods.js/moveCreatureToFolder.js';
-  import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+  import {snackbar} from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
   export default {
     components: {
diff --git a/app/imports/ui/creature/creatureList/CreatureListTile.vue b/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
similarity index 95%
rename from app/imports/ui/creature/creatureList/CreatureListTile.vue
rename to app/imports/client/ui/creature/creatureList/CreatureListTile.vue
index 2bb28101..ee9a7d95 100644
--- a/app/imports/ui/creature/creatureList/CreatureListTile.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
@@ -51,7 +51,7 @@
 </template>
 
 <script lang="js">
-import SharedIcon from '/imports/ui/components/SharedIcon.vue';
+import SharedIcon from '/imports/client/ui/components/SharedIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/creatureList/CreatureStorageStats.vue b/app/imports/client/ui/creature/creatureList/CreatureStorageStats.vue
similarity index 100%
rename from app/imports/ui/creature/creatureList/CreatureStorageStats.vue
rename to app/imports/client/ui/creature/creatureList/CreatureStorageStats.vue
diff --git a/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue b/app/imports/client/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
similarity index 92%
rename from app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
rename to app/imports/client/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
index 60eea258..32ae0e01 100644
--- a/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
+++ b/app/imports/client/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
@@ -180,17 +180,17 @@
 
 <script lang="js">
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import PROPERTIES, { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-import LibraryNodeExpansionContent from '/imports/ui/library/LibraryNodeExpansionContent.vue';
-import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
-import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
+import LibraryNodeExpansionContent from '/imports/client/ui/library/LibraryNodeExpansionContent.vue';
+import schemaFormMixin from '/imports/client/ui/properties/forms/shared/schemaFormMixin.js';
+import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
 import propertySchemasIndex from '/imports/api/properties/propertySchemasIndex.js';
 import Libraries from '/imports/api/library/Libraries.js';
-import getThemeColor from '/imports/ui/utility/getThemeColor.js';
-import PropertySelector from '/imports/ui/properties/shared/PropertySelector.vue';
-import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import getThemeColor from '/imports/client/ui/utility/getThemeColor.js';
+import PropertySelector from '/imports/client/ui/properties/shared/PropertySelector.vue';
+import {snackbar} from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue b/app/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue
similarity index 97%
rename from app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
rename to app/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue
index 9896a758..228e47f2 100644
--- a/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
+++ b/app/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue
@@ -51,7 +51,7 @@
 
 <script lang="js">
   import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
-  import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+  import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
 
   export default {
     components: {
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue b/app/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue
similarity index 96%
rename from app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue
rename to app/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue
index 8cc185f2..bb8df6f2 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue
+++ b/app/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue
@@ -15,7 +15,7 @@
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import nodesToTree from '/imports/api/parenting/nodesToTree.js'
-import TreeNodeList from '/imports/ui/components/tree/TreeNodeList.vue';
+import TreeNodeList from '/imports/client/ui/components/tree/TreeNodeList.vue';
 import { organizeDoc, reorderDoc } from '/imports/api/parenting/organizeMethods.js';
 
 export default {
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
similarity index 80%
rename from app/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
rename to app/imports/client/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
index db6ceb72..3738ae12 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
+++ b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
@@ -13,8 +13,8 @@
 </template>
 
 <script lang="js">
-import SelectablePropertyDialog from '/imports/ui/properties/shared/SelectablePropertyDialog.vue';
-import CreaturePropertyInsertForm from '/imports/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue';
+import SelectablePropertyDialog from '/imports/client/ui/properties/shared/SelectablePropertyDialog.vue';
+import CreaturePropertyInsertForm from '/imports/client/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue
similarity index 90%
rename from app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
rename to app/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue
index da516221..3fa48041 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
+++ b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue
@@ -118,23 +118,23 @@ import restoreProperty from '/imports/api/creature/creatureProperties/methods/re
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
 import duplicateProperty from '/imports/api/creature/creatureProperties/methods/duplicateProperty.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import PropertyToolbar from '/imports/ui/components/propertyToolbar.vue';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import PropertyToolbar from '/imports/client/ui/components/propertyToolbar.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
-import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
-import propertyViewerIndex from '/imports/ui/properties/viewers/shared/propertyViewerIndex.js';
-import CreaturePropertiesTree from '/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
-import getPropertyTitle from '/imports/ui/properties/shared/getPropertyTitle.js';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
+import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
+import propertyViewerIndex from '/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js';
+import CreaturePropertiesTree from '/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
+import getPropertyTitle from '/imports/client/ui/properties/shared/getPropertyTitle.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { get, findLast } from 'lodash';
 import equipItem from '/imports/api/creature/creatureProperties/methods/equipItem.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import { getHighestOrder } from '/imports/api/parenting/order.js';
 import insertProperty from '/imports/api/creature/creatureProperties/methods/insertProperty.js';
-import Breadcrumbs from '/imports/ui/creature/creatureProperties/Breadcrumbs.vue';
+import Breadcrumbs from '/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue';
 import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
-import PropertyField from '/imports/ui/properties/viewers/shared/PropertyField.vue';
+import PropertyField from '/imports/client/ui/properties/viewers/shared/PropertyField.vue';
 
 let formIndex = {};
 for (let key in propertyFormIndex){
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue
similarity index 82%
rename from app/imports/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue
rename to app/imports/client/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue
index 72d0e8da..79495671 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue
+++ b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue
@@ -23,8 +23,8 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import LibraryAndNode from '/imports/ui/library/LibraryAndNode.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import LibraryAndNode from '/imports/client/ui/library/LibraryAndNode.vue';
 export default {
   components: {
     DialogBase,
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue
similarity index 84%
rename from app/imports/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue
rename to app/imports/client/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue
index 951bbc13..e2deb0bd 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue
+++ b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue
@@ -40,10 +40,10 @@
 
 <script lang="js">
 import propertySchemasIndex from '/imports/api/properties/propertySchemasIndex.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
-import ColorPicker from '/imports/ui/components/ColorPicker.vue';
-import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
+import ColorPicker from '/imports/client/ui/components/ColorPicker.vue';
+import schemaFormMixin from '/imports/client/ui/properties/forms/shared/schemaFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/experiences/ExperienceForm.vue b/app/imports/client/ui/creature/experiences/ExperienceForm.vue
similarity index 93%
rename from app/imports/ui/creature/experiences/ExperienceForm.vue
rename to app/imports/client/ui/creature/experiences/ExperienceForm.vue
index e80040aa..19272387 100644
--- a/app/imports/ui/creature/experiences/ExperienceForm.vue
+++ b/app/imports/client/ui/creature/experiences/ExperienceForm.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/creature/experiences/ExperienceInsertDialog.vue b/app/imports/client/ui/creature/experiences/ExperienceInsertDialog.vue
similarity index 86%
rename from app/imports/ui/creature/experiences/ExperienceInsertDialog.vue
rename to app/imports/client/ui/creature/experiences/ExperienceInsertDialog.vue
index 9b9ecc72..ffde78df 100644
--- a/app/imports/ui/creature/experiences/ExperienceInsertDialog.vue
+++ b/app/imports/client/ui/creature/experiences/ExperienceInsertDialog.vue
@@ -27,10 +27,10 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import ExperienceForm from '/imports/ui/creature/experiences/ExperienceForm.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import ExperienceForm from '/imports/client/ui/creature/experiences/ExperienceForm.vue';
 import { ExperienceSchema, insertExperience } from '/imports/api/creature/experience/Experiences.js';
-import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
+import schemaFormMixin from '/imports/client/ui/properties/forms/shared/schemaFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/experiences/ExperienceListDialog.vue b/app/imports/client/ui/creature/experiences/ExperienceListDialog.vue
similarity index 98%
rename from app/imports/ui/creature/experiences/ExperienceListDialog.vue
rename to app/imports/client/ui/creature/experiences/ExperienceListDialog.vue
index b90450f7..05dc6333 100644
--- a/app/imports/ui/creature/experiences/ExperienceListDialog.vue
+++ b/app/imports/client/ui/creature/experiences/ExperienceListDialog.vue
@@ -86,7 +86,7 @@
 
 <script lang="js">
 import { format } from 'date-fns';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Experiences, { removeExperience, recomputeExperiences } from '/imports/api/creature/experience/Experiences.js';
 
 export default {
diff --git a/app/imports/ui/creature/slots/LevelUpDialog.vue b/app/imports/client/ui/creature/slots/LevelUpDialog.vue
similarity index 96%
rename from app/imports/ui/creature/slots/LevelUpDialog.vue
rename to app/imports/client/ui/creature/slots/LevelUpDialog.vue
index 4503a96e..460e2ec5 100644
--- a/app/imports/ui/creature/slots/LevelUpDialog.vue
+++ b/app/imports/client/ui/creature/slots/LevelUpDialog.vue
@@ -182,16 +182,16 @@
 import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue'
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue'
 import resolve, { toString } from '/imports/parser/resolve.js';
 import { prettifyParseError, parse } from '/imports/parser/parser.js';
 // import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
 import getSlotFillFilter from '/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js'
 import Libraries from '/imports/api/library/Libraries.js';
-import LibraryNodeExpansionContent from '/imports/ui/library/LibraryNodeExpansionContent.vue';
-import PropertyTags from '/imports/ui/properties/viewers/shared/PropertyTags.vue';
+import LibraryNodeExpansionContent from '/imports/client/ui/library/LibraryNodeExpansionContent.vue';
+import PropertyTags from '/imports/client/ui/properties/viewers/shared/PropertyTags.vue';
 import { clone } from 'lodash';
 
 export default {
diff --git a/app/imports/ui/creature/slots/SlotCard.vue b/app/imports/client/ui/creature/slots/SlotCard.vue
similarity index 88%
rename from app/imports/ui/creature/slots/SlotCard.vue
rename to app/imports/client/ui/creature/slots/SlotCard.vue
index 44f6ab76..41140419 100644
--- a/app/imports/ui/creature/slots/SlotCard.vue
+++ b/app/imports/client/ui/creature/slots/SlotCard.vue
@@ -37,8 +37,8 @@
 </template>
 
 <script lang="js">
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/slots/SlotCardsToFill.vue b/app/imports/client/ui/creature/slots/SlotCardsToFill.vue
similarity index 91%
rename from app/imports/ui/creature/slots/SlotCardsToFill.vue
rename to app/imports/client/ui/creature/slots/SlotCardsToFill.vue
index 043489e7..f188306b 100644
--- a/app/imports/ui/creature/slots/SlotCardsToFill.vue
+++ b/app/imports/client/ui/creature/slots/SlotCardsToFill.vue
@@ -35,12 +35,12 @@
 
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import SlotCard from '/imports/ui/creature/slots/SlotCard.vue';
-import PointBuyCard from '/imports/ui/properties/components/pointBuy/PointBuyCard.vue';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import SlotCard from '/imports/client/ui/creature/slots/SlotCard.vue';
+import PointBuyCard from '/imports/client/ui/properties/components/pointBuy/PointBuyCard.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
 import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/slots/SlotFillDialog.vue b/app/imports/client/ui/creature/slots/SlotFillDialog.vue
similarity index 96%
rename from app/imports/ui/creature/slots/SlotFillDialog.vue
rename to app/imports/client/ui/creature/slots/SlotFillDialog.vue
index cbad8fb9..8b2d24f0 100644
--- a/app/imports/ui/creature/slots/SlotFillDialog.vue
+++ b/app/imports/client/ui/creature/slots/SlotFillDialog.vue
@@ -183,16 +183,16 @@
 import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue'
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue'
 import resolve, { toString } from '/imports/parser/resolve.js';
 import { prettifyParseError, parse } from '/imports/parser/parser.js';
 // import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
 import getSlotFillFilter from '/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js'
 import Libraries from '/imports/api/library/Libraries.js';
-import LibraryNodeExpansionContent from '/imports/ui/library/LibraryNodeExpansionContent.vue';
-import PropertyTags from '/imports/ui/properties/viewers/shared/PropertyTags.vue';
+import LibraryNodeExpansionContent from '/imports/client/ui/library/LibraryNodeExpansionContent.vue';
+import PropertyTags from '/imports/client/ui/properties/viewers/shared/PropertyTags.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 import { clone } from 'lodash';
 
diff --git a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue b/app/imports/client/ui/dialogStack/DeleteConfirmationDialog.vue
similarity index 95%
rename from app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
rename to app/imports/client/ui/dialogStack/DeleteConfirmationDialog.vue
index c8b76735..71fbd4ba 100644
--- a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
+++ b/app/imports/client/ui/dialogStack/DeleteConfirmationDialog.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/dialogStack/DialogBase.vue b/app/imports/client/ui/dialogStack/DialogBase.vue
similarity index 93%
rename from app/imports/ui/dialogStack/DialogBase.vue
rename to app/imports/client/ui/dialogStack/DialogBase.vue
index 4fcdd912..84517e52 100644
--- a/app/imports/ui/dialogStack/DialogBase.vue
+++ b/app/imports/client/ui/dialogStack/DialogBase.vue
@@ -50,8 +50,8 @@
 </template>
 
 <script lang="js">
-import getThemeColor from '/imports/ui/utility/getThemeColor.js';
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
+import getThemeColor from '/imports/client/ui/utility/getThemeColor.js';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
 
 export default {
   props: {
diff --git a/app/imports/client/ui/dialogStack/DialogComponentIndex.js b/app/imports/client/ui/dialogStack/DialogComponentIndex.js
new file mode 100644
index 00000000..87530412
--- /dev/null
+++ b/app/imports/client/ui/dialogStack/DialogComponentIndex.js
@@ -0,0 +1,66 @@
+// Load commonly used dialogs immediately
+import AddCreaturePropertyDialog from '/imports/client/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue';
+import CharacterCreationDialog from '/imports/client/ui/creature/character/CharacterCreationDialog.vue';
+import CastSpellWithSlotDialog from '/imports/client/ui/properties/components/spells/CastSpellWithSlotDialog.vue';
+import CreatureFormDialog from '/imports/client/ui/creature/CreatureFormDialog.vue';
+import CreaturePropertyCreationDialog from '/imports/client/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue';
+import CreaturePropertyDialog from '/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue';
+import CreaturePropertyFromLibraryDialog from '/imports/client/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue';
+import CreatureRootDialog from '/imports/client/ui/creature/character/CreatureRootDialog.vue';
+import DeleteConfirmationDialog from '/imports/client/ui/dialogStack/DeleteConfirmationDialog.vue';
+import ExperienceInsertDialog from  '/imports/client/ui/creature/experiences/ExperienceInsertDialog.vue';
+import ExperienceListDialog from  '/imports/client/ui/creature/experiences/ExperienceListDialog.vue';
+import HelpDialog from  '/imports/client/ui/dialogStack/HelpDialog.vue';
+import LevelUpDialog from '/imports/client/ui/creature/slots/LevelUpDialog.vue';
+import SelectLibraryNodeDialog from '/imports/client/ui/library/SelectLibraryNodeDialog.vue';
+import SlotFillDialog from '/imports/client/ui/creature/slots/SlotFillDialog.vue';
+import TierTooLowDialog from '/imports/client/ui/user/TierTooLowDialog.vue';
+import TransferOwnershipDialog from '/imports/client/ui/sharing/TransferOwnershipDialog.vue';
+
+// Lazily load less common dialogs
+const ArchiveDialog = () => import('/imports/client/ui/creature/archive/ArchiveDialog.vue');
+const DeleteUserAccountDialog = () => import('/imports/client/ui/user/DeleteUserAccountDialog.vue');
+const InviteDialog = () => import('/imports/client/ui/user/InviteDialog.vue');
+const LibraryCollectionCreationDialog = () => import('/imports/client/ui/library/LibraryCollectionCreationDialog.vue');
+const LibraryCollectionEditDialog = () => import('/imports/client/ui/library/LibraryCollectionEditDialog.vue');
+const LibraryCreationDialog = () => import('/imports/client/ui/library/LibraryCreationDialog.vue');
+const LibraryEditDialog = () => import('/imports/client/ui/library/LibraryEditDialog.vue');
+const LibraryNodeCreationDialog = () => import('/imports/client/ui/library/LibraryNodeCreationDialog.vue');
+const LibraryNodeDialog = () => import('/imports/client/ui/library/LibraryNodeDialog.vue');
+const MoveLibraryNodeDialog = () => import('/imports/client/ui/library/MoveLibraryNodeDialog.vue');
+const SelectCreaturesDialog = () => import('/imports/client/ui/tabletop/SelectCreaturesDialog.vue');
+const ShareDialog = () => import('/imports/client/ui/sharing/ShareDialog.vue');
+const UsernameDialog = () => import('/imports/client/ui/user/UsernameDialog.vue');
+
+export default {
+  AddCreaturePropertyDialog,
+  ArchiveDialog,
+  CastSpellWithSlotDialog,
+  CharacterCreationDialog,
+  CreatureFormDialog,
+  CreaturePropertyCreationDialog,
+  CreaturePropertyDialog,
+  CreaturePropertyFromLibraryDialog,
+  CreatureRootDialog,
+  DeleteConfirmationDialog,
+  DeleteUserAccountDialog,
+  ExperienceInsertDialog,
+  ExperienceListDialog,
+  HelpDialog,
+  InviteDialog,
+  LevelUpDialog,
+  LibraryCollectionCreationDialog,
+  LibraryCollectionEditDialog,
+  LibraryCreationDialog,
+  LibraryEditDialog,
+  LibraryNodeCreationDialog,
+  LibraryNodeDialog,
+  MoveLibraryNodeDialog,
+  SelectCreaturesDialog,
+  SelectLibraryNodeDialog,
+  ShareDialog,
+  SlotFillDialog,
+  TierTooLowDialog,
+  TransferOwnershipDialog,
+  UsernameDialog,
+};
diff --git a/app/imports/ui/dialogStack/DialogStack.vue b/app/imports/client/ui/dialogStack/DialogStack.vue
similarity index 97%
rename from app/imports/ui/dialogStack/DialogStack.vue
rename to app/imports/client/ui/dialogStack/DialogStack.vue
index 94e398a0..1bf88109 100644
--- a/app/imports/ui/dialogStack/DialogStack.vue
+++ b/app/imports/client/ui/dialogStack/DialogStack.vue
@@ -42,9 +42,9 @@
 </template>
 
 <script lang="js">
-  import '/imports/ui/dialogStack/dialogStackWindowEvents.js';
-  import mockElement from '/imports/ui/dialogStack/mockElement.js';
-  import DialogComponentIndex from '/imports/ui/dialogStack/DialogComponentIndex.js';
+  import '/imports/client/ui/dialogStack/dialogStackWindowEvents.js';
+  import mockElement from '/imports/client/ui/dialogStack/mockElement.js';
+  import DialogComponentIndex from '/imports/client/ui/dialogStack/DialogComponentIndex.js';
 
   const OFFSET = 16;
   const MOCK_DURATION = 400; // Keep in sync with css transition of .dialog
diff --git a/app/imports/ui/dialogStack/HelpDialog.vue b/app/imports/client/ui/dialogStack/HelpDialog.vue
similarity index 93%
rename from app/imports/ui/dialogStack/HelpDialog.vue
rename to app/imports/client/ui/dialogStack/HelpDialog.vue
index 9fe700b2..b4a97ead 100644
--- a/app/imports/ui/dialogStack/HelpDialog.vue
+++ b/app/imports/client/ui/dialogStack/HelpDialog.vue
@@ -37,9 +37,9 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import { propsByDocsPath } from '/imports/constants/PROPERTIES.js';
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
 import Docs from '/imports/api/docs/Docs.js';
 
 export default {
diff --git a/app/imports/ui/dialogStack/dialogStackStore.js b/app/imports/client/ui/dialogStack/dialogStackStore.js
similarity index 78%
rename from app/imports/ui/dialogStack/dialogStackStore.js
rename to app/imports/client/ui/dialogStack/dialogStackStore.js
index 113bae96..32e66ba1 100644
--- a/app/imports/ui/dialogStack/dialogStackStore.js
+++ b/app/imports/client/ui/dialogStack/dialogStackStore.js
@@ -1,4 +1,5 @@
 import Vue from 'vue';
+import { clone } from 'lodash';
 
 let dialogStack = {};
 dialogStack.dialogs = [];
@@ -10,7 +11,7 @@ const dialogStackStore = {
     currentReturnElement: null,
   },
   mutations: {
-    pushDialogStack(state, {component, data, elementId, callback}){
+    pushDialogStack(state, { component, data, elementId, callback }) {
       // Generate a new _id so that Vue knows how to shuffle the array
       const _id = Random.id();
       state.dialogs.push({
@@ -22,8 +23,8 @@ const dialogStackStore = {
       });
       updateHistory();
     },
-    replaceDialog(state, {component, data}){
-      if (!state.dialogs.length){
+    replaceDialog(state, { component, data }) {
+      if (!state.dialogs.length) {
         throw new Meteor.Error('can\'t replace dialog if no dialogs are open');
       }
       let currentDialog = state.dialogs[state.dialogs.length - 1]
@@ -35,43 +36,43 @@ const dialogStackStore = {
         callback: currentDialog.callback,
       });
     },
-    popDialogStackMutation (state, result){
+    popDialogStackMutation(state, result) {
       const dialog = state.dialogs.pop();
       state.currentResult = null;
       updateHistory();
       if (!dialog) return;
-      if (dialog.callback){
+      if (dialog.callback) {
         let returnElementId = dialog.callback(result);
         state.currentReturnElement = returnElementId;
       } else {
         state.currentReturnElement = null;
       }
     },
-    setCurrentResult (state, result){
+    setCurrentResult(state, result) {
       state.currentResult = result;
     },
   },
   actions: {
-    popDialogStack(context, result){
-      if (history && history.state && history.state.openDialogs){
+    popDialogStack(context, result) {
+      if (history && history.state && history.state.openDialogs) {
         context.commit('setCurrentResult', result);
         history.back();
       } else {
         context.commit('popDialogStackMutation', result);
       }
     },
-    popDialogStacks(context, quantity){
+    popDialogStacks(context, quantity) {
       if (quantity <= 0) return;
       let iterationsLeft = quantity;
       let intervalId = setInterval(() => {
-        if (history && history.state && history.state.openDialogs){
+        if (history && history.state && history.state.openDialogs) {
           context.commit('setCurrentResult');
           history.back();
         } else {
           context.commit('popDialogStackMutation');
         }
         iterationsLeft -= 1;
-        if (iterationsLeft === 0){
+        if (iterationsLeft === 0) {
           clearInterval(intervalId);
         }
       }, 150);
@@ -81,7 +82,7 @@ const dialogStackStore = {
 
 export default dialogStackStore;
 
-const updateHistory = function(){
+const updateHistory = function () {
   // history should looks like: [{openDialogs: 0}, {openDialogs: n}] where
   // n is the number of open dialogs
 
@@ -89,8 +90,8 @@ const updateHistory = function(){
   if (!history) return;
   // Make sure that there is a state tracking open dialogs
   // replace the state without bashing it in the process
-  if (!history.state || !_.isFinite(history.state.openDialogs)){
-    let newState = _.clone(history.state)  || {};
+  if (!history.state || !Number.isFinite(history.state.openDialogs)) {
+    let newState = clone(history.state) || {};
     newState.openDialogs = 0;
     history.replaceState(newState, '');
   }
@@ -102,24 +103,24 @@ const updateHistory = function(){
   // anything
   if (numDialogs === stateDialogs) return;
 
-  if (stateDialogs > 0){
+  if (stateDialogs > 0) {
     // On a dialog count
-    if (numDialogs === 0){
+    if (numDialogs === 0) {
       // but shouldn't be
       history.back();
     } else {
       // but should replace with correct count
-      let newState = _.clone(history.state) || {};
+      let newState = clone(history.state) || {};
       newState.openDialogs = dialogStackStore.state.dialogs.length;
       history.replaceState(newState, '');
     }
-  } else if (numDialogs > 0 && stateDialogs === 0){
+  } else if (numDialogs > 0 && stateDialogs === 0) {
     // On the zero state, push a dialog count
-    history.pushState({openDialogs: numDialogs}, '');
+    history.pushState({ openDialogs: numDialogs }, '');
   } else {
     console.warn(
       'History could not be updated correctly, unexpected case',
-      {stateDialogs, numDialogs},
+      { stateDialogs, numDialogs },
     )
   }
 };
diff --git a/app/imports/ui/dialogStack/dialogStackWindowEvents.js b/app/imports/client/ui/dialogStack/dialogStackWindowEvents.js
similarity index 50%
rename from app/imports/ui/dialogStack/dialogStackWindowEvents.js
rename to app/imports/client/ui/dialogStack/dialogStackWindowEvents.js
index 5cdcd375..caf9fbee 100644
--- a/app/imports/ui/dialogStack/dialogStackWindowEvents.js
+++ b/app/imports/client/ui/dialogStack/dialogStackWindowEvents.js
@@ -1,10 +1,10 @@
-import store from '/imports/ui/vuexStore.js';
+import store from '/imports/client/ui/vuexStore.js';
 
-if (window){
-  window.onpopstate = function(event){
+if (window) {
+  window.onpopstate = function (event) {
     let state = event.state;
     let numDialogs = store.state.dialogStack.dialogs.length;
-    if (_.isFinite(state.openDialogs) && numDialogs > state.openDialogs){
+    if (Number.isFinite(state.openDialogs) && numDialogs > state.openDialogs) {
       store.commit('popDialogStackMutation', store.state.dialogStack.currentResult);
     }
   };
diff --git a/app/imports/ui/dialogStack/mockElement.js b/app/imports/client/ui/dialogStack/mockElement.js
similarity index 100%
rename from app/imports/ui/dialogStack/mockElement.js
rename to app/imports/client/ui/dialogStack/mockElement.js
diff --git a/app/imports/ui/files/ArchiveFileCard.vue b/app/imports/client/ui/files/ArchiveFileCard.vue
similarity index 96%
rename from app/imports/ui/files/ArchiveFileCard.vue
rename to app/imports/client/ui/files/ArchiveFileCard.vue
index d8ec1f25..f1de6d3b 100644
--- a/app/imports/ui/files/ArchiveFileCard.vue
+++ b/app/imports/client/ui/files/ArchiveFileCard.vue
@@ -33,7 +33,7 @@
 
 <script lang="js">
 import restoreCreatureFromFile from '/imports/api/creature/archive/methods/restoreCreatureFromFile.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import { characterSlotsRemaining } from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
 import removeArchiveCreature from '/imports/api/creature/archive/methods/removeArchiveCreature.js';
 
diff --git a/app/imports/ui/files/FileStorageStats.vue b/app/imports/client/ui/files/FileStorageStats.vue
similarity index 94%
rename from app/imports/ui/files/FileStorageStats.vue
rename to app/imports/client/ui/files/FileStorageStats.vue
index c4ad854b..3551f9c2 100644
--- a/app/imports/ui/files/FileStorageStats.vue
+++ b/app/imports/client/ui/files/FileStorageStats.vue
@@ -29,7 +29,7 @@
 
 <script lang="js">
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import updateFileStorageUsed from '/imports/api/users/methods/updateFileStorageUsed.js';
 import prettyBytes from 'pretty-bytes';
 
diff --git a/app/imports/ui/files/UserImageCard.vue b/app/imports/client/ui/files/UserImageCard.vue
similarity index 100%
rename from app/imports/ui/files/UserImageCard.vue
rename to app/imports/client/ui/files/UserImageCard.vue
diff --git a/app/imports/ui/icons/IconAdmin.vue b/app/imports/client/ui/icons/IconAdmin.vue
similarity index 88%
rename from app/imports/ui/icons/IconAdmin.vue
rename to app/imports/client/ui/icons/IconAdmin.vue
index 3219be83..c8cf2c07 100644
--- a/app/imports/ui/icons/IconAdmin.vue
+++ b/app/imports/client/ui/icons/IconAdmin.vue
@@ -27,8 +27,8 @@
 </template>
 
 <script lang="js">
-  import {importIcons, importIconMetadata} from '/imports/ui/icons/importIcons.js';
-  import IconPicker from '/imports/ui/components/global/IconPicker.vue';
+  import {importIcons, importIconMetadata} from '/imports/client/ui/icons/importIcons.js';
+  import IconPicker from '/imports/client/ui/components/global/IconPicker.vue';
   import UploadButton from 'vuetify-upload-button';
 
   export default {
diff --git a/app/imports/ui/icons/SvgIconByName.vue b/app/imports/client/ui/icons/SvgIconByName.vue
similarity index 84%
rename from app/imports/ui/icons/SvgIconByName.vue
rename to app/imports/client/ui/icons/SvgIconByName.vue
index edbf1457..b750f7cc 100644
--- a/app/imports/ui/icons/SvgIconByName.vue
+++ b/app/imports/client/ui/icons/SvgIconByName.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script lang="js">
-import SvgIcon from '/imports/ui/components/global/SvgIcon.vue'
+import SvgIcon from '/imports/client/ui/components/global/SvgIcon.vue'
 import SVG_ICONS from '/imports/constants/SVG_ICONS.js';
 
 export default {
diff --git a/app/imports/ui/icons/importIcons.js b/app/imports/client/ui/icons/importIcons.js
similarity index 100%
rename from app/imports/ui/icons/importIcons.js
rename to app/imports/client/ui/icons/importIcons.js
diff --git a/app/imports/ui/layouts/AppLayout.vue b/app/imports/client/ui/layouts/AppLayout.vue
similarity index 91%
rename from app/imports/ui/layouts/AppLayout.vue
rename to app/imports/client/ui/layouts/AppLayout.vue
index 99469969..97e0e9d0 100644
--- a/app/imports/ui/layouts/AppLayout.vue
+++ b/app/imports/client/ui/layouts/AppLayout.vue
@@ -54,10 +54,10 @@
 
 <script lang="js">
 import '/imports/api/users/Users.js';
-import Sidebar from '/imports/ui/layouts/Sidebar.vue';
-import DialogStack from '/imports/ui/dialogStack/DialogStack.vue';
+import Sidebar from '/imports/client/ui/layouts/Sidebar.vue';
+import DialogStack from '/imports/client/ui/dialogStack/DialogStack.vue';
 import { mapMutations } from 'vuex';
-import SnackbarQueue from '/imports/ui/components/snackbars/SnackbarQueue.vue';
+import SnackbarQueue from '/imports/client/ui/components/snackbars/SnackbarQueue.vue';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 
 export default {
diff --git a/app/imports/client/ui/layouts/Sidebar.vue b/app/imports/client/ui/layouts/Sidebar.vue
new file mode 100644
index 00000000..01cbc7ce
--- /dev/null
+++ b/app/imports/client/ui/layouts/Sidebar.vue
@@ -0,0 +1,140 @@
+<template>
+  <div class="sidebar">
+    <v-layout
+      v-if="!signedIn"
+      justify-center
+    >
+      <v-btn
+        text
+        to="/sign-in"
+      >
+        Sign in
+      </v-btn>
+    </v-layout>
+    <v-list>
+      <v-list-item v-if="signedIn">
+        <v-list-item-content>
+          <v-list-item-title>
+            {{ userName }}
+          </v-list-item-title>
+        </v-list-item-content>
+        <v-list-item-action>
+          <v-tooltip bottom>
+            <template #activator="{ on }">
+              <v-btn
+                icon
+                to="/account"
+                v-on="on"
+              >
+                <v-icon>mdi-cog</v-icon>
+              </v-btn>
+            </template>
+            <span>Account Settings</span>
+          </v-tooltip>
+        </v-list-item-action>
+      </v-list-item>
+
+      <v-list-item
+        v-for="(link, i) in links"
+        :key="i"
+        :to="link.to"
+        :href="link.href"
+      >
+        <v-list-item-action>
+          <v-icon>{{ link.icon }}</v-icon>
+        </v-list-item-action>
+        <v-list-item-title>
+          {{ link.title }}
+        </v-list-item-title>
+        <v-icon v-if="link.href">
+          mdi-open-in-new
+        </v-icon>
+      </v-list-item>
+      <v-divider />
+    </v-list>
+    <creature-folder-list
+      dense
+      :creatures="CreaturesWithNoParty"
+      :folders="folders"
+    />
+  </div>
+</template>
+
+<script lang="js">
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+import CreatureFolderList from '/imports/client/ui/creature/creatureList/CreatureFolderList.vue';
+import getCreatureUrlName from '/imports/api/creature/creatures/getCreatureUrlName.js';
+import { uniq, flatten } from 'lodash';
+
+const characterTransform = function (char) {
+  char.url = `/character/${char._id}/${getCreatureUrlName(char)}`;
+  char.initial = char.name && char.name[0] || '?';
+  return char;
+};
+export default {
+  components: {
+    CreatureFolderList
+  },
+  meteor: {
+    $subscribe: {
+      'characterList': [],
+    },
+    signedIn() {
+      return Meteor.userId();
+    },
+    userName() {
+      let user = Meteor.user();
+      return user && user.username || user && user._id;
+    },
+    links() {
+      let isLoggedIn = !!Meteor.userId();
+      let links = [
+        { title: 'Home', icon: 'mdi-home', to: '/' },
+        { title: 'Characters', icon: 'mdi-account-group', to: '/characterList', requireLogin: true },
+        { title: 'Library', icon: 'mdi-library-shelves', to: '/library', requireLogin: true },
+        //{title: 'Tabletops', icon: 'api', to: '/tabletops', requireLogin: true},
+        //{title: 'Friends', icon: 'people', to: '/friends', requireLogin: true},
+        { title: 'Files', icon: 'mdi-file-multiple', to: '/my-files' },
+        { title: 'Feedback', icon: 'mdi-bug', to: '/feedback' },
+        { title: 'About', icon: 'mdi-sign-text', to: '/about' },
+        { title: 'Documentation', icon: 'mdi-book-open-variant', to: '/docs' },
+        { title: 'Patreon', icon: 'mdi-patreon', href: 'https://www.patreon.com/dicecloud' },
+        { title: 'Github', icon: 'mdi-github', href: 'https://github.com/ThaumRystra/DiceCloud/tree/version-2' },
+      ];
+      return links.filter(link => !link.requireLogin || isLoggedIn);
+    },
+    folders() {
+      const userId = Meteor.userId();
+      let folders = CreatureFolders.find(
+        { owner: userId, archived: { $ne: true } },
+        { sort: { order: 1 } },
+      ).map(folder => {
+        folder.creatures = Creatures.find(
+          {
+            _id: { $in: folder.creatures || [] },
+            $or: [{ readers: userId }, { writers: userId }, { owner: userId }],
+          }, {
+          sort: { name: 1 },
+        }
+        ).map(characterTransform);
+        return folder;
+      });
+      folders = folders.filter(folder => !!folder.creatures.length);
+      return folders;
+    },
+    CreaturesWithNoParty() {
+      var userId = Meteor.userId();
+      var charArrays = CreatureFolders.find({ owner: userId }).map(p => p.creatures);
+      var folderChars = uniq(flatten(charArrays));
+      return Creatures.find(
+        {
+          _id: { $nin: folderChars },
+          $or: [{ readers: userId }, { writers: userId }, { owner: userId }],
+        },
+        { sort: { name: 1 } }
+      ).map(characterTransform);
+    },
+  },
+};
+</script>
diff --git a/app/imports/ui/layouts/SingleCardLayout.vue b/app/imports/client/ui/layouts/SingleCardLayout.vue
similarity index 100%
rename from app/imports/ui/layouts/SingleCardLayout.vue
rename to app/imports/client/ui/layouts/SingleCardLayout.vue
diff --git a/app/imports/ui/library/InsertLibraryNodeButton.vue b/app/imports/client/ui/library/InsertLibraryNodeButton.vue
similarity index 100%
rename from app/imports/ui/library/InsertLibraryNodeButton.vue
rename to app/imports/client/ui/library/InsertLibraryNodeButton.vue
diff --git a/app/imports/ui/library/LibraryAndNode.vue b/app/imports/client/ui/library/LibraryAndNode.vue
similarity index 87%
rename from app/imports/ui/library/LibraryAndNode.vue
rename to app/imports/client/ui/library/LibraryAndNode.vue
index aa6601db..781fcac8 100644
--- a/app/imports/ui/library/LibraryAndNode.vue
+++ b/app/imports/client/ui/library/LibraryAndNode.vue
@@ -80,18 +80,18 @@
 </template>
 
 <script lang="js">
-import TreeDetailLayout from '/imports/ui/components/TreeDetailLayout.vue';
-import LibraryBrowser from '/imports/ui/library/LibraryBrowser.vue';
-import LibraryNodeDialog from '/imports/ui/library/LibraryNodeDialog.vue';
+import TreeDetailLayout from '/imports/client/ui/components/TreeDetailLayout.vue';
+import LibraryBrowser from '/imports/client/ui/library/LibraryBrowser.vue';
+import LibraryNodeDialog from '/imports/client/ui/library/LibraryNodeDialog.vue';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import Libraries from '/imports/api/library/Libraries.js';
-import LibraryContentsContainer from '/imports/ui/library/LibraryContentsContainer.vue';
-import InsertLibraryNodeButton from '/imports/ui/library/InsertLibraryNodeButton.vue';
+import LibraryContentsContainer from '/imports/client/ui/library/LibraryContentsContainer.vue';
+import InsertLibraryNodeButton from '/imports/client/ui/library/InsertLibraryNodeButton.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import getThemeColor from '/imports/ui/utility/getThemeColor.js';
-import TreeSearchInput from '/imports/ui/components/tree/TreeSearchInput.vue';
+import getThemeColor from '/imports/client/ui/utility/getThemeColor.js';
+import TreeSearchInput from '/imports/client/ui/components/tree/TreeSearchInput.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryBrowser.vue b/app/imports/client/ui/library/LibraryBrowser.vue
similarity index 95%
rename from app/imports/ui/library/LibraryBrowser.vue
rename to app/imports/client/ui/library/LibraryBrowser.vue
index 8d7cd84f..91d3c332 100644
--- a/app/imports/ui/library/LibraryBrowser.vue
+++ b/app/imports/client/ui/library/LibraryBrowser.vue
@@ -70,11 +70,11 @@
 </template>
 
 <script lang="js">
-import LibraryContentsContainer from '/imports/ui/library/LibraryContentsContainer.vue';
+import LibraryContentsContainer from '/imports/client/ui/library/LibraryContentsContainer.vue';
 import Libraries, { insertLibrary } from '/imports/api/library/Libraries.js';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import InsertLibraryNodeButton from '/imports/ui/library/InsertLibraryNodeButton.vue';
+import InsertLibraryNodeButton from '/imports/client/ui/library/InsertLibraryNodeButton.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryCollectionCreationDialog.vue b/app/imports/client/ui/library/LibraryCollectionCreationDialog.vue
similarity index 96%
rename from app/imports/ui/library/LibraryCollectionCreationDialog.vue
rename to app/imports/client/ui/library/LibraryCollectionCreationDialog.vue
index ed764930..5e4caa59 100644
--- a/app/imports/ui/library/LibraryCollectionCreationDialog.vue
+++ b/app/imports/client/ui/library/LibraryCollectionCreationDialog.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Libraries from '/imports/api/library/Libraries.js';
 
 export default {
diff --git a/app/imports/ui/library/LibraryCollectionEditDialog.vue b/app/imports/client/ui/library/LibraryCollectionEditDialog.vue
similarity index 95%
rename from app/imports/ui/library/LibraryCollectionEditDialog.vue
rename to app/imports/client/ui/library/LibraryCollectionEditDialog.vue
index cccce61a..4170cdce 100644
--- a/app/imports/ui/library/LibraryCollectionEditDialog.vue
+++ b/app/imports/client/ui/library/LibraryCollectionEditDialog.vue
@@ -57,9 +57,9 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import LibraryCollections, { updateLibraryCollection, removeLibraryCollection } from '/imports/api/library/LibraryCollections.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import Libraries from '/imports/api/library/Libraries.js';
 
 export default {
diff --git a/app/imports/ui/library/LibraryCollectionHeader.vue b/app/imports/client/ui/library/LibraryCollectionHeader.vue
similarity index 96%
rename from app/imports/ui/library/LibraryCollectionHeader.vue
rename to app/imports/client/ui/library/LibraryCollectionHeader.vue
index 39713450..8ad8b0b2 100644
--- a/app/imports/ui/library/LibraryCollectionHeader.vue
+++ b/app/imports/client/ui/library/LibraryCollectionHeader.vue
@@ -53,7 +53,7 @@
 
 <script lang="js">
 import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import SharedIcon from '/imports/ui/components/SharedIcon.vue';
+import SharedIcon from '/imports/client/ui/components/SharedIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryCollectionToolbar.vue b/app/imports/client/ui/library/LibraryCollectionToolbar.vue
similarity index 100%
rename from app/imports/ui/library/LibraryCollectionToolbar.vue
rename to app/imports/client/ui/library/LibraryCollectionToolbar.vue
diff --git a/app/imports/ui/library/LibraryContentsContainer.vue b/app/imports/client/ui/library/LibraryContentsContainer.vue
similarity index 97%
rename from app/imports/ui/library/LibraryContentsContainer.vue
rename to app/imports/client/ui/library/LibraryContentsContainer.vue
index 1e70fa07..77d83bfb 100644
--- a/app/imports/ui/library/LibraryContentsContainer.vue
+++ b/app/imports/client/ui/library/LibraryContentsContainer.vue
@@ -28,7 +28,7 @@
 import Libraries from '/imports/api/library/Libraries.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import nodesToTree from '/imports/api/parenting/nodesToTree.js';
-import TreeNodeList from '/imports/ui/components/tree/TreeNodeList.vue';
+import TreeNodeList from '/imports/client/ui/components/tree/TreeNodeList.vue';
 import { organizeDoc, reorderDoc } from '/imports/api/parenting/organizeMethods.js';
 
 export default {
diff --git a/app/imports/ui/library/LibraryCreationDialog.vue b/app/imports/client/ui/library/LibraryCreationDialog.vue
similarity index 94%
rename from app/imports/ui/library/LibraryCreationDialog.vue
rename to app/imports/client/ui/library/LibraryCreationDialog.vue
index fe71d5fa..8c0425f1 100644
--- a/app/imports/ui/library/LibraryCreationDialog.vue
+++ b/app/imports/client/ui/library/LibraryCreationDialog.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryEditDialog.vue b/app/imports/client/ui/library/LibraryEditDialog.vue
similarity index 94%
rename from app/imports/ui/library/LibraryEditDialog.vue
rename to app/imports/client/ui/library/LibraryEditDialog.vue
index 6586b649..36decbbc 100644
--- a/app/imports/ui/library/LibraryEditDialog.vue
+++ b/app/imports/client/ui/library/LibraryEditDialog.vue
@@ -75,11 +75,11 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Libraries, { updateLibraryName, updateLibraryDescription, removeLibrary } from '/imports/api/library/Libraries.js';
 import LibraryNodes, { restoreLibraryNode } from '/imports/api/library/LibraryNodes.js';
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryList.vue b/app/imports/client/ui/library/LibraryList.vue
similarity index 95%
rename from app/imports/ui/library/LibraryList.vue
rename to app/imports/client/ui/library/LibraryList.vue
index c850ddd7..cb9d09d1 100644
--- a/app/imports/ui/library/LibraryList.vue
+++ b/app/imports/client/ui/library/LibraryList.vue
@@ -63,11 +63,11 @@
 
 <script lang="js">
 import { union } from 'lodash';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import LibraryCollections, { insertLibraryCollection } from '/imports/api/library/LibraryCollections.js';
 import Libraries, { insertLibrary } from '/imports/api/library/Libraries.js';
-import LibraryListTile from '/imports/ui/library/LibraryListTile.vue'
-import LibraryCollectionHeader from '/imports/ui/library/LibraryCollectionHeader.vue';
+import LibraryListTile from '/imports/client/ui/library/LibraryListTile.vue'
+import LibraryCollectionHeader from '/imports/client/ui/library/LibraryCollectionHeader.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryListTile.vue b/app/imports/client/ui/library/LibraryListTile.vue
similarity index 94%
rename from app/imports/ui/library/LibraryListTile.vue
rename to app/imports/client/ui/library/LibraryListTile.vue
index d2a9fa7f..06ce9087 100644
--- a/app/imports/ui/library/LibraryListTile.vue
+++ b/app/imports/client/ui/library/LibraryListTile.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script lang="js" functional>
-import SharedIcon from '/imports/ui/components/SharedIcon.vue';
+import SharedIcon from '/imports/client/ui/components/SharedIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryNodeCreationDialog.vue b/app/imports/client/ui/library/LibraryNodeCreationDialog.vue
similarity index 74%
rename from app/imports/ui/library/LibraryNodeCreationDialog.vue
rename to app/imports/client/ui/library/LibraryNodeCreationDialog.vue
index 2f4ff67d..b4748be7 100644
--- a/app/imports/ui/library/LibraryNodeCreationDialog.vue
+++ b/app/imports/client/ui/library/LibraryNodeCreationDialog.vue
@@ -9,8 +9,8 @@
 </template>
 
 <script lang="js">
-import SelectablePropertyDialog from '/imports/ui/properties/shared/SelectablePropertyDialog.vue';
-import LibraryNodeInsertForm from '/imports/ui/library/LibraryNodeInsertForm.vue';
+import SelectablePropertyDialog from '/imports/client/ui/properties/shared/SelectablePropertyDialog.vue';
+import LibraryNodeInsertForm from '/imports/client/ui/library/LibraryNodeInsertForm.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/library/LibraryNodeDialog.vue b/app/imports/client/ui/library/LibraryNodeDialog.vue
similarity index 92%
rename from app/imports/ui/library/LibraryNodeDialog.vue
rename to app/imports/client/ui/library/LibraryNodeDialog.vue
index 977f3906..67cd16dd 100644
--- a/app/imports/ui/library/LibraryNodeDialog.vue
+++ b/app/imports/client/ui/library/LibraryNodeDialog.vue
@@ -89,19 +89,19 @@
     restoreLibraryNode,
   } from '/imports/api/library/LibraryNodes.js';
   import duplicateLibraryNode from '/imports/api/library/methods/duplicateLibraryNode.js';
-  import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-  import PropertyToolbar from '/imports/ui/components/propertyToolbar.vue';
+  import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+  import PropertyToolbar from '/imports/client/ui/components/propertyToolbar.vue';
   import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-  import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
-  import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
-  import propertyViewerIndex from '/imports/ui/properties/viewers/shared/propertyViewerIndex.js';
+  import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
+  import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
+  import propertyViewerIndex from '/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js';
   import { get } from 'lodash';
   import {
     assertDocEditPermission, assertDocCopyPermission
   } from '/imports/api/sharing/sharingPermissions.js';
   import { organizeDoc } from '/imports/api/parenting/organizeMethods.js';
-  import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
-  import getPropertyTitle from '/imports/ui/properties/shared/getPropertyTitle.js';
+  import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+  import getPropertyTitle from '/imports/client/ui/properties/shared/getPropertyTitle.js';
   import copyLibraryNodeTo from '/imports/api/library/methods/copyLibraryNodeTo.js';
 
   let formIndex = {};
diff --git a/app/imports/ui/library/LibraryNodeExpansionContent.vue b/app/imports/client/ui/library/LibraryNodeExpansionContent.vue
similarity index 87%
rename from app/imports/ui/library/LibraryNodeExpansionContent.vue
rename to app/imports/client/ui/library/LibraryNodeExpansionContent.vue
index 30e614db..1067d4a5 100644
--- a/app/imports/ui/library/LibraryNodeExpansionContent.vue
+++ b/app/imports/client/ui/library/LibraryNodeExpansionContent.vue
@@ -17,8 +17,8 @@
 <script lang="js">
 import nodesToTree from '/imports/api/parenting/nodesToTree.js'
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
-import propertyViewerIndex from '/imports/ui/properties/viewers/shared/propertyViewerIndex.js';
-import TreeNodeList from '/imports/ui/components/tree/TreeNodeList.vue';
+import propertyViewerIndex from '/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js';
+import TreeNodeList from '/imports/client/ui/components/tree/TreeNodeList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryNodeInsertForm.vue b/app/imports/client/ui/library/LibraryNodeInsertForm.vue
similarity index 87%
rename from app/imports/ui/library/LibraryNodeInsertForm.vue
rename to app/imports/client/ui/library/LibraryNodeInsertForm.vue
index c006dde6..3263558e 100644
--- a/app/imports/ui/library/LibraryNodeInsertForm.vue
+++ b/app/imports/client/ui/library/LibraryNodeInsertForm.vue
@@ -46,10 +46,10 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
-import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
-import ColorPicker from '/imports/ui/components/ColorPicker.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
+import schemaFormMixin from '/imports/client/ui/properties/forms/shared/schemaFormMixin.js';
+import ColorPicker from '/imports/client/ui/components/ColorPicker.vue';
 import propertySchemasIndex from '/imports/api/properties/propertySchemasIndex.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 
diff --git a/app/imports/ui/library/MoveLibraryNodeDialog.vue b/app/imports/client/ui/library/MoveLibraryNodeDialog.vue
similarity index 83%
rename from app/imports/ui/library/MoveLibraryNodeDialog.vue
rename to app/imports/client/ui/library/MoveLibraryNodeDialog.vue
index f0d22101..7151391d 100644
--- a/app/imports/ui/library/MoveLibraryNodeDialog.vue
+++ b/app/imports/client/ui/library/MoveLibraryNodeDialog.vue
@@ -23,8 +23,8 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import LibraryAndNode from '/imports/ui/library/LibraryAndNode.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import LibraryAndNode from '/imports/client/ui/library/LibraryAndNode.vue';
 export default {
   components: {
     DialogBase,
diff --git a/app/imports/ui/library/SelectLibraryNodeDialog.vue b/app/imports/client/ui/library/SelectLibraryNodeDialog.vue
similarity index 84%
rename from app/imports/ui/library/SelectLibraryNodeDialog.vue
rename to app/imports/client/ui/library/SelectLibraryNodeDialog.vue
index 114a194e..39d1b77d 100644
--- a/app/imports/ui/library/SelectLibraryNodeDialog.vue
+++ b/app/imports/client/ui/library/SelectLibraryNodeDialog.vue
@@ -30,8 +30,8 @@
 </template>
 
 <script lang="js">
-  import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-  import LibraryAndNode from '/imports/ui/library/LibraryAndNode.vue';
+  import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+  import LibraryAndNode from '/imports/client/ui/library/LibraryAndNode.vue';
   export default {
     components: {
       DialogBase,
diff --git a/app/imports/ui/library/SingleLibraryToolbar.vue b/app/imports/client/ui/library/SingleLibraryToolbar.vue
similarity index 100%
rename from app/imports/ui/library/SingleLibraryToolbar.vue
rename to app/imports/client/ui/library/SingleLibraryToolbar.vue
diff --git a/app/imports/ui/log/CharacterLog.vue b/app/imports/client/ui/log/CharacterLog.vue
similarity index 98%
rename from app/imports/ui/log/CharacterLog.vue
rename to app/imports/client/ui/log/CharacterLog.vue
index 4cfdcdab..41941b52 100644
--- a/app/imports/ui/log/CharacterLog.vue
+++ b/app/imports/client/ui/log/CharacterLog.vue
@@ -39,7 +39,7 @@ import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { parse, prettifyParseError } from '/imports/parser/parser.js';
 import resolve, { toString } from '/imports/parser/resolve.js';
-import LogEntry from '/imports/ui/log/LogEntry.vue';
+import LogEntry from '/imports/client/ui/log/LogEntry.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/log/LogContent.vue b/app/imports/client/ui/log/LogContent.vue
similarity index 92%
rename from app/imports/ui/log/LogContent.vue
rename to app/imports/client/ui/log/LogContent.vue
index 8c109c23..8de93e87 100644
--- a/app/imports/ui/log/LogContent.vue
+++ b/app/imports/client/ui/log/LogContent.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script lang="js">
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/log/LogEntry.vue b/app/imports/client/ui/log/LogEntry.vue
similarity index 86%
rename from app/imports/ui/log/LogEntry.vue
rename to app/imports/client/ui/log/LogEntry.vue
index 90f7087f..63b37c56 100644
--- a/app/imports/ui/log/LogEntry.vue
+++ b/app/imports/client/ui/log/LogEntry.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="js">
-import LogContent from '/imports/ui/log/LogContent.vue';
+import LogContent from '/imports/client/ui/log/LogContent.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/markdownCofig.js b/app/imports/client/ui/markdownCofig.js
similarity index 100%
rename from app/imports/ui/markdownCofig.js
rename to app/imports/client/ui/markdownCofig.js
diff --git a/app/imports/ui/pages/About.vue b/app/imports/client/ui/pages/About.vue
similarity index 100%
rename from app/imports/ui/pages/About.vue
rename to app/imports/client/ui/pages/About.vue
diff --git a/app/imports/ui/pages/Account.vue b/app/imports/client/ui/pages/Account.vue
similarity index 97%
rename from app/imports/ui/pages/Account.vue
rename to app/imports/client/ui/pages/Account.vue
index 1deea14a..5f196ce8 100644
--- a/app/imports/ui/pages/Account.vue
+++ b/app/imports/client/ui/pages/Account.vue
@@ -226,15 +226,15 @@
 </template>
 
 <script lang="js">
-  import router from '/imports/ui/router.js';
+  import router from '/imports/client/ui/router.js';
   import getEntitledCents from '/imports/api/users/patreon/getEntitledCents.js';
   import Invites from '/imports/api/users/Invites.js';
   import linkWithPatreon from '/imports/api/users/methods/linkWithPatreon.js'
   import { getUserTier } from '/imports/api/users/patreon/tiers.js';
   import addEmail from '/imports/api/users/methods/addEmail.js';
   import removeEmail from '/imports/api/users/methods/removeEmail.js';
-  import CreatureStorageStats from '/imports/ui/creature/creatureList/CreatureStorageStats.vue';
-  import FileStorageStats from '/imports/ui/files/FileStorageStats.vue';
+  import CreatureStorageStats from '/imports/client/ui/creature/creatureList/CreatureStorageStats.vue';
+  import FileStorageStats from '/imports/client/ui/files/FileStorageStats.vue';
 
   export default {
     components: {
diff --git a/app/imports/ui/pages/Admin.vue b/app/imports/client/ui/pages/Admin.vue
similarity index 100%
rename from app/imports/ui/pages/Admin.vue
rename to app/imports/client/ui/pages/Admin.vue
diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/client/ui/pages/CharacterList.vue
similarity index 76%
rename from app/imports/ui/pages/CharacterList.vue
rename to app/imports/client/ui/pages/CharacterList.vue
index 3a675911..20290aee 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/client/ui/pages/CharacterList.vue
@@ -40,7 +40,7 @@
               </v-icon>
             </v-btn>
           </v-alert>
-          <v-card :class="{'mb-4': folders && folders.length}">
+          <v-card :class="{ 'mb-4': folders && folders.length }">
             <creature-folder-list
               :creatures="CreaturesWithNoParty"
               :folders="folders"
@@ -78,12 +78,13 @@ import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 import insertCreatureFolder from '/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js';
-import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
-import CreatureFolderList from '/imports/ui/creature/creatureList/CreatureFolderList.vue';
-import ArchiveButton from '/imports/ui/creature/creatureList/ArchiveButton.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+import CreatureFolderList from '/imports/client/ui/creature/creatureList/CreatureFolderList.vue';
+import ArchiveButton from '/imports/client/ui/creature/creatureList/ArchiveButton.vue';
 import getCreatureUrlName from '/imports/api/creature/creatures/getCreatureUrlName.js';
+import { uniq, flatten } from 'lodash';
 
-const characterTransform = function(char){
+const characterTransform = function (char) {
   char.url = `/character/${char._id}/${getCreatureUrlName(char)}`;
   char.initial = char.name && char.name[0] || '?';
   return char;
@@ -93,28 +94,30 @@ export default {
     CreatureFolderList,
     ArchiveButton,
   },
-  data(){ return{
-    fab: false,
-    loadingInsertFolder: false,
-    renamingFolder: undefined,
-  }},
+  data() {
+    return {
+      fab: false,
+      loadingInsertFolder: false,
+      renamingFolder: undefined,
+    }
+  },
   meteor: {
     $subscribe: {
       'characterList': [],
     },
-    folders(){
+    folders() {
       const userId = Meteor.userId();
-      let folders =  CreatureFolders.find(
-        {owner: userId, archived: {$ne: true}},
-        {sort: {order: 1}},
+      let folders = CreatureFolders.find(
+        { owner: userId, archived: { $ne: true } },
+        { sort: { order: 1 } },
       ).map(folder => {
         folder.creatures = Creatures.find(
           {
-            _id: {$in: folder.creatures || []},
-            $or: [{readers: userId}, {writers: userId}, {owner: userId}],
+            _id: { $in: folder.creatures || [] },
+            $or: [{ readers: userId }, { writers: userId }, { owner: userId }],
           }, {
-            sort: {name: 1},
-          }
+          sort: { name: 1 },
+        }
         ).map(characterTransform);
         return folder;
       });
@@ -122,35 +125,35 @@ export default {
     },
     CreaturesWithNoParty() {
       var userId = Meteor.userId();
-      var charArrays = CreatureFolders.find({owner: userId}).map(p => p.creatures);
-      var folderChars = _.uniq(_.flatten(charArrays));
+      var charArrays = CreatureFolders.find({ owner: userId }).map(p => p.creatures);
+      var folderChars = uniq(flatten(charArrays));
       return Creatures.find(
         {
-          _id: {$nin: folderChars},
-          $or: [{readers: userId}, {writers: userId}, {owner: userId}],
+          _id: { $nin: folderChars },
+          $or: [{ readers: userId }, { writers: userId }, { owner: userId }],
         },
-        {sort: {name: 1}}
+        { sort: { name: 1 } }
       ).map(characterTransform);
     },
-    creatureCount(){
+    creatureCount() {
       let userId = Meteor.userId();
       return Creatures.find({
         owner: userId,
       }, {
-        fields: {_id: 1},
+        fields: { _id: 1 },
       }).count();
     },
-    tier(){
+    tier() {
       let userId = Meteor.userId();
       return getUserTier(userId);
     },
-    characterSpaceLeft(){
+    characterSpaceLeft() {
       let tier = this.tier;
       let currentCharacterCount = this.creatureCount;
       if (tier.characterSlots === -1) return Number.POSITIVE_INFINITY;
       return tier.characterSlots - currentCharacterCount
     },
-    exceededCharacterSpace(){
+    exceededCharacterSpace() {
       let tier = this.tier;
       let currentCharacterCount = this.creatureCount;
       return tier.characterSlots !== -1 && currentCharacterCount > tier.characterSlots
@@ -165,7 +168,7 @@ export default {
         callback: creatureId => creatureId,
       });
     },
-    insertFolder(){
+    insertFolder() {
       this.loadingInsertFolder = true;
       insertCreatureFolder.call(error => {
         this.loadingInsertFolder = false;
diff --git a/app/imports/ui/pages/CharacterSheetPage.vue b/app/imports/client/ui/pages/CharacterSheetPage.vue
similarity index 69%
rename from app/imports/ui/pages/CharacterSheetPage.vue
rename to app/imports/client/ui/pages/CharacterSheetPage.vue
index a2346e36..26865fde 100644
--- a/app/imports/ui/pages/CharacterSheetPage.vue
+++ b/app/imports/client/ui/pages/CharacterSheetPage.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script lang="js">
-import CharacterSheet from '/imports/ui/creature/character/CharacterSheet.vue';
+import CharacterSheet from '/imports/client/ui/creature/character/CharacterSheet.vue';
 export default {
   components: {
     CharacterSheet,
diff --git a/app/imports/ui/pages/Documentation.vue b/app/imports/client/ui/pages/Documentation.vue
similarity index 96%
rename from app/imports/ui/pages/Documentation.vue
rename to app/imports/client/ui/pages/Documentation.vue
index d8c83c53..0147de1a 100644
--- a/app/imports/ui/pages/Documentation.vue
+++ b/app/imports/client/ui/pages/Documentation.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script lang="js">
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
 import Docs from '/imports/api/docs/Docs.js';
 import { propsByDocsPath } from '/imports/constants/PROPERTIES.js';
 
diff --git a/app/imports/ui/pages/EmailVerificationError.vue b/app/imports/client/ui/pages/EmailVerificationError.vue
similarity index 100%
rename from app/imports/ui/pages/EmailVerificationError.vue
rename to app/imports/client/ui/pages/EmailVerificationError.vue
diff --git a/app/imports/ui/pages/EmailVerificationSuccess.vue b/app/imports/client/ui/pages/EmailVerificationSuccess.vue
similarity index 100%
rename from app/imports/ui/pages/EmailVerificationSuccess.vue
rename to app/imports/client/ui/pages/EmailVerificationSuccess.vue
diff --git a/app/imports/ui/pages/Feedback.vue b/app/imports/client/ui/pages/Feedback.vue
similarity index 100%
rename from app/imports/ui/pages/Feedback.vue
rename to app/imports/client/ui/pages/Feedback.vue
diff --git a/app/imports/ui/pages/Files.vue b/app/imports/client/ui/pages/Files.vue
similarity index 94%
rename from app/imports/ui/pages/Files.vue
rename to app/imports/client/ui/pages/Files.vue
index b30856e7..d9af57ec 100644
--- a/app/imports/ui/pages/Files.vue
+++ b/app/imports/client/ui/pages/Files.vue
@@ -101,11 +101,11 @@
 import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
 import UserImages from '/imports/api/files/UserImages.js';
 import prettyBytes from 'pretty-bytes';
-import ArchiveFileCard from '/imports/ui/files/ArchiveFileCard.vue';
-import FileStorageStats from '/imports/ui/files/FileStorageStats.vue';
-import ImageUploadInput from '/imports/ui/components/ImageUploadInput.vue';
-import UserImageCard from '/imports/ui/files/UserImageCard.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import ArchiveFileCard from '/imports/client/ui/files/ArchiveFileCard.vue';
+import FileStorageStats from '/imports/client/ui/files/FileStorageStats.vue';
+import ImageUploadInput from '/imports/client/ui/components/ImageUploadInput.vue';
+import UserImageCard from '/imports/client/ui/files/UserImageCard.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import { archiveSchema } from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
 
 export default {
diff --git a/app/imports/ui/pages/Friends.vue b/app/imports/client/ui/pages/Friends.vue
similarity index 100%
rename from app/imports/ui/pages/Friends.vue
rename to app/imports/client/ui/pages/Friends.vue
diff --git a/app/imports/ui/pages/FunctionReference.vue b/app/imports/client/ui/pages/FunctionReference.vue
similarity index 100%
rename from app/imports/ui/pages/FunctionReference.vue
rename to app/imports/client/ui/pages/FunctionReference.vue
diff --git a/app/imports/ui/pages/Home.vue b/app/imports/client/ui/pages/Home.vue
similarity index 100%
rename from app/imports/ui/pages/Home.vue
rename to app/imports/client/ui/pages/Home.vue
diff --git a/app/imports/ui/pages/InviteError.vue b/app/imports/client/ui/pages/InviteError.vue
similarity index 100%
rename from app/imports/ui/pages/InviteError.vue
rename to app/imports/client/ui/pages/InviteError.vue
diff --git a/app/imports/ui/pages/InviteSuccess.vue b/app/imports/client/ui/pages/InviteSuccess.vue
similarity index 100%
rename from app/imports/ui/pages/InviteSuccess.vue
rename to app/imports/client/ui/pages/InviteSuccess.vue
diff --git a/app/imports/ui/pages/LaunchCountdown.vue b/app/imports/client/ui/pages/LaunchCountdown.vue
similarity index 100%
rename from app/imports/ui/pages/LaunchCountdown.vue
rename to app/imports/client/ui/pages/LaunchCountdown.vue
diff --git a/app/imports/ui/pages/Library.vue b/app/imports/client/ui/pages/Library.vue
similarity index 97%
rename from app/imports/ui/pages/Library.vue
rename to app/imports/client/ui/pages/Library.vue
index 65a2d18f..87eaacd7 100644
--- a/app/imports/ui/pages/Library.vue
+++ b/app/imports/client/ui/pages/Library.vue
@@ -58,10 +58,10 @@
 <script lang="js">
 import { union } from 'lodash';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import LibraryCollections, { insertLibraryCollection } from '/imports/api/library/LibraryCollections.js';
 import Libraries, { insertLibrary } from '/imports/api/library/Libraries.js';
-import LibraryList from '/imports/ui/library/LibraryList.vue';
+import LibraryList from '/imports/client/ui/library/LibraryList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/pages/LibraryCollection.vue b/app/imports/client/ui/pages/LibraryCollection.vue
similarity index 95%
rename from app/imports/ui/pages/LibraryCollection.vue
rename to app/imports/client/ui/pages/LibraryCollection.vue
index 414e2320..b436387a 100644
--- a/app/imports/ui/pages/LibraryCollection.vue
+++ b/app/imports/client/ui/pages/LibraryCollection.vue
@@ -46,7 +46,7 @@
 <script lang="js">
 import LibraryCollections from '/imports/api/library/LibraryCollections.js';
 import Libraries from '/imports/api/library/Libraries.js';
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/pages/Maintenance.vue b/app/imports/client/ui/pages/Maintenance.vue
similarity index 100%
rename from app/imports/ui/pages/Maintenance.vue
rename to app/imports/client/ui/pages/Maintenance.vue
diff --git a/app/imports/ui/pages/NotFound.vue b/app/imports/client/ui/pages/NotFound.vue
similarity index 100%
rename from app/imports/ui/pages/NotFound.vue
rename to app/imports/client/ui/pages/NotFound.vue
diff --git a/app/imports/ui/pages/NotImplemented.vue b/app/imports/client/ui/pages/NotImplemented.vue
similarity index 100%
rename from app/imports/ui/pages/NotImplemented.vue
rename to app/imports/client/ui/pages/NotImplemented.vue
diff --git a/app/imports/ui/pages/PatreonLevelTooLow.vue b/app/imports/client/ui/pages/PatreonLevelTooLow.vue
similarity index 100%
rename from app/imports/ui/pages/PatreonLevelTooLow.vue
rename to app/imports/client/ui/pages/PatreonLevelTooLow.vue
diff --git a/app/imports/ui/pages/Register.vue b/app/imports/client/ui/pages/Register.vue
similarity index 100%
rename from app/imports/ui/pages/Register.vue
rename to app/imports/client/ui/pages/Register.vue
diff --git a/app/imports/ui/pages/ResetPassword.vue b/app/imports/client/ui/pages/ResetPassword.vue
similarity index 100%
rename from app/imports/ui/pages/ResetPassword.vue
rename to app/imports/client/ui/pages/ResetPassword.vue
diff --git a/app/imports/ui/pages/SignIn.vue b/app/imports/client/ui/pages/SignIn.vue
similarity index 100%
rename from app/imports/ui/pages/SignIn.vue
rename to app/imports/client/ui/pages/SignIn.vue
diff --git a/app/imports/ui/pages/SingleLibrary.vue b/app/imports/client/ui/pages/SingleLibrary.vue
similarity index 82%
rename from app/imports/ui/pages/SingleLibrary.vue
rename to app/imports/client/ui/pages/SingleLibrary.vue
index 4faa0452..d997de56 100644
--- a/app/imports/ui/pages/SingleLibrary.vue
+++ b/app/imports/client/ui/pages/SingleLibrary.vue
@@ -7,8 +7,8 @@
 </template>
 
 <script lang="js">
-import SingleCardLayout from '/imports/ui/layouts/SingleCardLayout.vue';
-import LibraryAndNode from '/imports/ui/library/LibraryAndNode.vue';
+import SingleCardLayout from '/imports/client/ui/layouts/SingleCardLayout.vue';
+import LibraryAndNode from '/imports/client/ui/library/LibraryAndNode.vue';
 import Libraries from '/imports/api/library/Libraries.js';
 
 export default {
diff --git a/app/imports/ui/pages/Tabletop.vue b/app/imports/client/ui/pages/Tabletop.vue
similarity index 92%
rename from app/imports/ui/pages/Tabletop.vue
rename to app/imports/client/ui/pages/Tabletop.vue
index fd1f17ac..bb3c54fb 100644
--- a/app/imports/ui/pages/Tabletop.vue
+++ b/app/imports/client/ui/pages/Tabletop.vue
@@ -39,7 +39,7 @@
 
 <script lang="js">
 import Tabletops from '/imports/api/tabletop/Tabletops.js';
-import TabletopComponent from '/imports/ui/tabletop/TabletopComponent.vue';
+import TabletopComponent from '/imports/client/ui/tabletop/TabletopComponent.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/pages/Tabletops.vue b/app/imports/client/ui/pages/Tabletops.vue
similarity index 89%
rename from app/imports/ui/pages/Tabletops.vue
rename to app/imports/client/ui/pages/Tabletops.vue
index 5417feb4..1f03b42b 100644
--- a/app/imports/ui/pages/Tabletops.vue
+++ b/app/imports/client/ui/pages/Tabletops.vue
@@ -34,10 +34,10 @@
 </template>
 
 <script lang="js">
-import SingleCardLayout from '/imports/ui/layouts/SingleCardLayout.vue'
+import SingleCardLayout from '/imports/client/ui/layouts/SingleCardLayout.vue'
 import Tabletops from '/imports/api/tabletop/Tabletops.js';
 import insertTabletop from '/imports/api/tabletop/methods/insertTabletop.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/actions/ActionCard.vue b/app/imports/client/ui/properties/components/actions/ActionCard.vue
similarity index 90%
rename from app/imports/ui/properties/components/actions/ActionCard.vue
rename to app/imports/client/ui/properties/components/actions/ActionCard.vue
index 040009c9..b2c67042 100644
--- a/app/imports/ui/properties/components/actions/ActionCard.vue
+++ b/app/imports/client/ui/properties/components/actions/ActionCard.vue
@@ -101,16 +101,16 @@
 
 <script lang="js">
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
 import doAction from '/imports/api/engine/actions/doAction.js';
-import AttributeConsumedView from '/imports/ui/properties/components/actions/AttributeConsumedView.vue';
-import ItemConsumedView from '/imports/ui/properties/components/actions/ItemConsumedView.vue';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
-import RollPopup from '/imports/ui/components/RollPopup.vue';
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
-import TreeNodeList from '/imports/ui/components/tree/TreeNodeList.vue';
+import AttributeConsumedView from '/imports/client/ui/properties/components/actions/AttributeConsumedView.vue';
+import ItemConsumedView from '/imports/client/ui/properties/components/actions/ItemConsumedView.vue';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
+import RollPopup from '/imports/client/ui/components/RollPopup.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
+import TreeNodeList from '/imports/client/ui/components/tree/TreeNodeList.vue';
 import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { some } from 'lodash';
diff --git a/app/imports/ui/properties/components/actions/AttributeConsumedView.vue b/app/imports/client/ui/properties/components/actions/AttributeConsumedView.vue
similarity index 100%
rename from app/imports/ui/properties/components/actions/AttributeConsumedView.vue
rename to app/imports/client/ui/properties/components/actions/AttributeConsumedView.vue
diff --git a/app/imports/ui/properties/components/actions/EventButton.vue b/app/imports/client/ui/properties/components/actions/EventButton.vue
similarity index 89%
rename from app/imports/ui/properties/components/actions/EventButton.vue
rename to app/imports/client/ui/properties/components/actions/EventButton.vue
index 29bdb0c6..27773e04 100644
--- a/app/imports/ui/properties/components/actions/EventButton.vue
+++ b/app/imports/client/ui/properties/components/actions/EventButton.vue
@@ -22,8 +22,8 @@
 
 <script lang="js">
 import doAction from '/imports/api/engine/actions/doAction.js';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/actions/ItemConsumedView.vue b/app/imports/client/ui/properties/components/actions/ItemConsumedView.vue
similarity index 96%
rename from app/imports/ui/properties/components/actions/ItemConsumedView.vue
rename to app/imports/client/ui/properties/components/actions/ItemConsumedView.vue
index 3363c5a4..f0eae75a 100644
--- a/app/imports/ui/properties/components/actions/ItemConsumedView.vue
+++ b/app/imports/client/ui/properties/components/actions/ItemConsumedView.vue
@@ -83,7 +83,7 @@
 </template>
 
 <script lang="js">
-import SelectItemToConsume from '/imports/ui/properties/components/actions/SelectItemToConsume.vue';
+import SelectItemToConsume from '/imports/client/ui/properties/components/actions/SelectItemToConsume.vue';
 export default {
   components: {
     SelectItemToConsume,
diff --git a/app/imports/ui/properties/components/actions/SelectItemToConsume.vue b/app/imports/client/ui/properties/components/actions/SelectItemToConsume.vue
similarity index 94%
rename from app/imports/ui/properties/components/actions/SelectItemToConsume.vue
rename to app/imports/client/ui/properties/components/actions/SelectItemToConsume.vue
index 1e1538a3..5634958e 100644
--- a/app/imports/ui/properties/components/actions/SelectItemToConsume.vue
+++ b/app/imports/client/ui/properties/components/actions/SelectItemToConsume.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script lang="js">
-import ItemTreeNode from '/imports/ui/properties/treeNodeViews/ItemTreeNode.vue';
+import ItemTreeNode from '/imports/client/ui/properties/treeNodeViews/ItemTreeNode.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import selectAmmoItem from '/imports/api/creature/creatureProperties/methods/selectAmmoItem.js';
 import { findIndex } from 'lodash';
diff --git a/app/imports/ui/properties/components/attributes/AbilityListTile.vue b/app/imports/client/ui/properties/components/attributes/AbilityListTile.vue
similarity index 92%
rename from app/imports/ui/properties/components/attributes/AbilityListTile.vue
rename to app/imports/client/ui/properties/components/attributes/AbilityListTile.vue
index 46d36bb8..2cc2eb95 100644
--- a/app/imports/ui/properties/components/attributes/AbilityListTile.vue
+++ b/app/imports/client/ui/properties/components/attributes/AbilityListTile.vue
@@ -52,10 +52,10 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import RollPopup from '/imports/ui/components/RollPopup.vue';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
+import RollPopup from '/imports/client/ui/components/RollPopup.vue';
 import doCheck from '/imports/api/engine/actions/doCheck.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/attributes/AttributeCard.vue b/app/imports/client/ui/properties/components/attributes/AttributeCard.vue
similarity index 81%
rename from app/imports/ui/properties/components/attributes/AttributeCard.vue
rename to app/imports/client/ui/properties/components/attributes/AttributeCard.vue
index f1fd03f9..2f96dd5f 100644
--- a/app/imports/ui/properties/components/attributes/AttributeCard.vue
+++ b/app/imports/client/ui/properties/components/attributes/AttributeCard.vue
@@ -11,8 +11,8 @@
 </template>
 
 <script lang="js">
-  import CardHighlight from '/imports/ui/components/CardHighlight.vue';
-  import AttributeCardContent from '/imports/ui/properties/components/attributes/AttributeCardContent.vue';
+  import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
+  import AttributeCardContent from '/imports/client/ui/properties/components/attributes/AttributeCardContent.vue';
 
   export default {
     components: {
diff --git a/app/imports/ui/properties/components/attributes/AttributeCardContent.vue b/app/imports/client/ui/properties/components/attributes/AttributeCardContent.vue
similarity index 89%
rename from app/imports/ui/properties/components/attributes/AttributeCardContent.vue
rename to app/imports/client/ui/properties/components/attributes/AttributeCardContent.vue
index 439ad70f..c1976688 100644
--- a/app/imports/ui/properties/components/attributes/AttributeCardContent.vue
+++ b/app/imports/client/ui/properties/components/attributes/AttributeCardContent.vue
@@ -35,10 +35,10 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import RollPopup from '/imports/ui/components/RollPopup.vue';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
+import RollPopup from '/imports/client/ui/components/RollPopup.vue';
 import doCheck from '/imports/api/engine/actions/doCheck.js';
-import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import {snackbar} from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/attributes/AttributeEffect.vue b/app/imports/client/ui/properties/components/attributes/AttributeEffect.vue
similarity index 96%
rename from app/imports/ui/properties/components/attributes/AttributeEffect.vue
rename to app/imports/client/ui/properties/components/attributes/AttributeEffect.vue
index 5725a3ef..43f4e212 100644
--- a/app/imports/ui/properties/components/attributes/AttributeEffect.vue
+++ b/app/imports/client/ui/properties/components/attributes/AttributeEffect.vue
@@ -41,8 +41,8 @@
 </template>
 
 <script lang="js">
-import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
-import Breadcrumbs from '/imports/ui/creature/creatureProperties/Breadcrumbs.vue';
+import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
+import Breadcrumbs from '/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { isFinite } from 'lodash';
 
diff --git a/app/imports/ui/properties/components/attributes/HealthBar.vue b/app/imports/client/ui/properties/components/attributes/HealthBar.vue
similarity index 97%
rename from app/imports/ui/properties/components/attributes/HealthBar.vue
rename to app/imports/client/ui/properties/components/attributes/HealthBar.vue
index cc83302b..8a8732ff 100644
--- a/app/imports/ui/properties/components/attributes/HealthBar.vue
+++ b/app/imports/client/ui/properties/components/attributes/HealthBar.vue
@@ -83,8 +83,8 @@
 </template>
 
 <script lang="js">
-import IncrementMenu from '/imports/ui/components/IncrementMenu.vue';
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
+import IncrementMenu from '/imports/client/ui/components/IncrementMenu.vue';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
 import chroma from 'chroma-js';
 
 export default {
diff --git a/app/imports/ui/properties/components/attributes/HealthBarCard.vue b/app/imports/client/ui/properties/components/attributes/HealthBarCard.vue
similarity index 84%
rename from app/imports/ui/properties/components/attributes/HealthBarCard.vue
rename to app/imports/client/ui/properties/components/attributes/HealthBarCard.vue
index 48b4b89a..54d82d48 100644
--- a/app/imports/ui/properties/components/attributes/HealthBarCard.vue
+++ b/app/imports/client/ui/properties/components/attributes/HealthBarCard.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script lang="js">
-import HealthBar from '/imports/ui/properties/components/attributes/HealthBar.vue';
+import HealthBar from '/imports/client/ui/properties/components/attributes/HealthBar.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue b/app/imports/client/ui/properties/components/attributes/HealthBarCardContainer.vue
similarity index 94%
rename from app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
rename to app/imports/client/ui/properties/components/attributes/HealthBarCardContainer.vue
index db3b9c66..d4ee6bd7 100644
--- a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
+++ b/app/imports/client/ui/properties/components/attributes/HealthBarCardContainer.vue
@@ -15,7 +15,7 @@
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 
-import HealthBarCard from '/imports/ui/properties/components/attributes/HealthBarCard.vue';
+import HealthBarCard from '/imports/client/ui/properties/components/attributes/HealthBarCard.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 
 export default {
diff --git a/app/imports/ui/properties/components/attributes/HitDiceListTile.vue b/app/imports/client/ui/properties/components/attributes/HitDiceListTile.vue
similarity index 96%
rename from app/imports/ui/properties/components/attributes/HitDiceListTile.vue
rename to app/imports/client/ui/properties/components/attributes/HitDiceListTile.vue
index 7cfff667..f7f86554 100644
--- a/app/imports/ui/properties/components/attributes/HitDiceListTile.vue
+++ b/app/imports/client/ui/properties/components/attributes/HitDiceListTile.vue
@@ -56,7 +56,7 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
 export default {
   inject: {
     context: { default: {} }
diff --git a/app/imports/ui/properties/components/attributes/ResourceCard.vue b/app/imports/client/ui/properties/components/attributes/ResourceCard.vue
similarity index 81%
rename from app/imports/ui/properties/components/attributes/ResourceCard.vue
rename to app/imports/client/ui/properties/components/attributes/ResourceCard.vue
index 1ebd7c91..a46cede2 100644
--- a/app/imports/ui/properties/components/attributes/ResourceCard.vue
+++ b/app/imports/client/ui/properties/components/attributes/ResourceCard.vue
@@ -16,8 +16,8 @@
 </template>
 
 <script lang="js">
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
-import ResourceCardContent from '/imports/ui/properties/components/attributes/ResourceCardContent.vue';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
+import ResourceCardContent from '/imports/client/ui/properties/components/attributes/ResourceCardContent.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/attributes/ResourceCardContent.vue b/app/imports/client/ui/properties/components/attributes/ResourceCardContent.vue
similarity index 100%
rename from app/imports/ui/properties/components/attributes/ResourceCardContent.vue
rename to app/imports/client/ui/properties/components/attributes/ResourceCardContent.vue
diff --git a/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue b/app/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue
similarity index 96%
rename from app/imports/ui/properties/components/attributes/SpellSlotListTile.vue
rename to app/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue
index f4a00384..26b5b4da 100644
--- a/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue
+++ b/app/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue
@@ -53,7 +53,7 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
 export default {
   props: {
     model: {
diff --git a/app/imports/ui/properties/components/attributes/SplitListLayout.vue b/app/imports/client/ui/properties/components/attributes/SplitListLayout.vue
similarity index 100%
rename from app/imports/ui/properties/components/attributes/SplitListLayout.vue
rename to app/imports/client/ui/properties/components/attributes/SplitListLayout.vue
diff --git a/app/imports/ui/properties/components/buffs/BuffListItem.vue b/app/imports/client/ui/properties/components/buffs/BuffListItem.vue
similarity index 100%
rename from app/imports/ui/properties/components/buffs/BuffListItem.vue
rename to app/imports/client/ui/properties/components/buffs/BuffListItem.vue
diff --git a/app/imports/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue b/app/imports/client/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue
similarity index 100%
rename from app/imports/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue
rename to app/imports/client/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue
diff --git a/app/imports/ui/properties/components/effects/InlineEffect.vue b/app/imports/client/ui/properties/components/effects/InlineEffect.vue
similarity index 97%
rename from app/imports/ui/properties/components/effects/InlineEffect.vue
rename to app/imports/client/ui/properties/components/effects/InlineEffect.vue
index 9ac97e38..611ada43 100644
--- a/app/imports/ui/properties/components/effects/InlineEffect.vue
+++ b/app/imports/client/ui/properties/components/effects/InlineEffect.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script lang="js">
-  import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
+  import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
   import { isFinite } from 'lodash';
 
   export default {
diff --git a/app/imports/ui/properties/components/features/FeatureCard.vue b/app/imports/client/ui/properties/components/features/FeatureCard.vue
similarity index 83%
rename from app/imports/ui/properties/components/features/FeatureCard.vue
rename to app/imports/client/ui/properties/components/features/FeatureCard.vue
index 860e11de..a8096891 100644
--- a/app/imports/ui/properties/components/features/FeatureCard.vue
+++ b/app/imports/client/ui/properties/components/features/FeatureCard.vue
@@ -20,8 +20,8 @@
 </template>
 
 <script lang="js">
-import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue'
+import ToolbarCard from '/imports/client/ui/components/ToolbarCard.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue'
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/folders/FolderGroupCard.vue b/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue
similarity index 94%
rename from app/imports/ui/properties/components/folders/FolderGroupCard.vue
rename to app/imports/client/ui/properties/components/folders/FolderGroupCard.vue
index a216c8a6..7729cd9c 100644
--- a/app/imports/ui/properties/components/folders/FolderGroupCard.vue
+++ b/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue
@@ -24,7 +24,7 @@
 
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import propComponents from '/imports/ui/properties/components/folders/propertyComponentIndex.js';
+import propComponents from '/imports/client/ui/properties/components/folders/propertyComponentIndex.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue b/app/imports/client/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue
similarity index 72%
rename from app/imports/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue
rename to app/imports/client/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue
index 7bcb81da..acf0d8d5 100644
--- a/app/imports/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue
+++ b/app/imports/client/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue
@@ -17,8 +17,8 @@
 </template>
 
 <script lang="js">
-import ActionCard from '/imports/ui/properties/components/actions/ActionCard.vue';
-import EventButton from '/imports/ui/properties/components/actions/EventButton.vue';
+import ActionCard from '/imports/client/ui/properties/components/actions/ActionCard.vue';
+import EventButton from '/imports/client/ui/properties/components/actions/EventButton.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue b/app/imports/client/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
similarity index 73%
rename from app/imports/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
rename to app/imports/client/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
index 30677f39..a2ef661d 100644
--- a/app/imports/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
+++ b/app/imports/client/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
@@ -43,13 +43,13 @@
 </template>
 
 <script lang="js">
-import AbilityListTile from '/imports/ui/properties/components/attributes/AbilityListTile.vue';
-import HitDiceListTile from '/imports/ui/properties/components/attributes/HitDiceListTile.vue';
-import HealthBar from '/imports/ui/properties/components/attributes/HealthBar.vue';
-import SpellSlotListTile from '/imports/ui/properties/components/attributes/SpellSlotListTile.vue';
-import ResourceCardContent from '/imports/ui/properties/components/attributes/ResourceCardContent.vue';
-import AttributeCardContent from '/imports/ui/properties/components/attributes/AttributeCardContent.vue';
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import AbilityListTile from '/imports/client/ui/properties/components/attributes/AbilityListTile.vue';
+import HitDiceListTile from '/imports/client/ui/properties/components/attributes/HitDiceListTile.vue';
+import HealthBar from '/imports/client/ui/properties/components/attributes/HealthBar.vue';
+import SpellSlotListTile from '/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue';
+import ResourceCardContent from '/imports/client/ui/properties/components/attributes/ResourceCardContent.vue';
+import AttributeCardContent from '/imports/client/ui/properties/components/attributes/AttributeCardContent.vue';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
 
 import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 
diff --git a/app/imports/ui/properties/components/folders/propertyComponentIndex.js b/app/imports/client/ui/properties/components/folders/propertyComponentIndex.js
similarity index 59%
rename from app/imports/ui/properties/components/folders/propertyComponentIndex.js
rename to app/imports/client/ui/properties/components/folders/propertyComponentIndex.js
index b61d0181..de9ce052 100644
--- a/app/imports/ui/properties/components/folders/propertyComponentIndex.js
+++ b/app/imports/client/ui/properties/components/folders/propertyComponentIndex.js
@@ -1,31 +1,31 @@
-import action from '/imports/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue';
+import action from '/imports/client/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue';
 //import adjustment from '';
 import attribute from './folderGroupComponents/AttributeGroupComponent.vue';
-import buff from '/imports/ui/properties/components/buffs/BuffListItem.vue';
+import buff from '/imports/client/ui/properties/components/buffs/BuffListItem.vue';
 //import buffRemover from '';
 //import branch from '';
 //import constant from '';
-import container from '/imports/ui/properties/components/inventory/ContainerCard.vue';
+import container from '/imports/client/ui/properties/components/inventory/ContainerCard.vue';
 //import classComponent from '';
 //import classLevel from '';
 //import damage from '';
 //import damageMultiplier from '';
 //import effect from '';
-import feature from '/imports/ui/properties/components/features/FeatureCard.vue';
+import feature from '/imports/client/ui/properties/components/features/FeatureCard.vue';
 // import folder from '';
-import item from '/imports/ui/properties/components/inventory/ItemListTile.vue';
-import note from '/imports/ui/properties/components/persona/NoteCard.vue';
+import item from '/imports/client/ui/properties/components/inventory/ItemListTile.vue';
+import note from '/imports/client/ui/properties/components/persona/NoteCard.vue';
 //import pointBuy from '';
 //import proficiency from '';
 //import propertySlot from '';
 //import reference from '';
 //import roll from '';
 //import savingThrow from '';
-import skill from '/imports/ui/properties/components/skills/SkillListTile.vue';
+import skill from '/imports/client/ui/properties/components/skills/SkillListTile.vue';
 //import slotFiller from '';
 //import spellList from '';
 //import spell from '';
-import toggle from '/imports/ui/properties/components/toggles/ToggleCard.vue';
+import toggle from '/imports/client/ui/properties/components/toggles/ToggleCard.vue';
 //import trigger from '';
 
 export default {
diff --git a/app/imports/ui/properties/components/inventory/ContainerCard.vue b/app/imports/client/ui/properties/components/inventory/ContainerCard.vue
similarity index 91%
rename from app/imports/ui/properties/components/inventory/ContainerCard.vue
rename to app/imports/client/ui/properties/components/inventory/ContainerCard.vue
index 0843dcfd..b2d6de9f 100644
--- a/app/imports/ui/properties/components/inventory/ContainerCard.vue
+++ b/app/imports/client/ui/properties/components/inventory/ContainerCard.vue
@@ -43,10 +43,10 @@
 </template>
 
 <script lang="js">
-import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
-import ItemList from '/imports/ui/properties/components/inventory/ItemList.vue';
+import ToolbarCard from '/imports/client/ui/components/ToolbarCard.vue';
+import ItemList from '/imports/client/ui/properties/components/inventory/ItemList.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import CoinValue from '/imports/ui/components/CoinValue.vue';
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
 
 export default {
diff --git a/app/imports/ui/properties/components/inventory/ItemList.vue b/app/imports/client/ui/properties/components/inventory/ItemList.vue
similarity index 96%
rename from app/imports/ui/properties/components/inventory/ItemList.vue
rename to app/imports/client/ui/properties/components/inventory/ItemList.vue
index 28a07995..8c617ab2 100644
--- a/app/imports/ui/properties/components/inventory/ItemList.vue
+++ b/app/imports/client/ui/properties/components/inventory/ItemList.vue
@@ -28,7 +28,7 @@
 
 <script lang="js">
 import draggable from 'vuedraggable';
-import ItemListTile from '/imports/ui/properties/components/inventory/ItemListTile.vue';
+import ItemListTile from '/imports/client/ui/properties/components/inventory/ItemListTile.vue';
 import { organizeDoc } from '/imports/api/parenting/organizeMethods.js';
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
 
diff --git a/app/imports/ui/properties/components/inventory/ItemListTile.vue b/app/imports/client/ui/properties/components/inventory/ItemListTile.vue
similarity index 91%
rename from app/imports/ui/properties/components/inventory/ItemListTile.vue
rename to app/imports/client/ui/properties/components/inventory/ItemListTile.vue
index 72fb09c6..cf252ddc 100644
--- a/app/imports/ui/properties/components/inventory/ItemListTile.vue
+++ b/app/imports/client/ui/properties/components/inventory/ItemListTile.vue
@@ -45,11 +45,11 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 import adjustQuantity from '/imports/api/creature/creatureProperties/methods/adjustQuantity.js';
-import IncrementButton from '/imports/ui/components/IncrementButton.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import IncrementButton from '/imports/client/ui/components/IncrementButton.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/persona/NoteCard.vue b/app/imports/client/ui/properties/components/persona/NoteCard.vue
similarity index 83%
rename from app/imports/ui/properties/components/persona/NoteCard.vue
rename to app/imports/client/ui/properties/components/persona/NoteCard.vue
index d07afa1e..8139f9a9 100644
--- a/app/imports/ui/properties/components/persona/NoteCard.vue
+++ b/app/imports/client/ui/properties/components/persona/NoteCard.vue
@@ -26,9 +26,9 @@
 </template>
 
 <script lang="js">
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/pointBuy/PointBuyCard.vue b/app/imports/client/ui/properties/components/pointBuy/PointBuyCard.vue
similarity index 94%
rename from app/imports/ui/properties/components/pointBuy/PointBuyCard.vue
rename to app/imports/client/ui/properties/components/pointBuy/PointBuyCard.vue
index cbd3f339..f102192d 100644
--- a/app/imports/ui/properties/components/pointBuy/PointBuyCard.vue
+++ b/app/imports/client/ui/properties/components/pointBuy/PointBuyCard.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script lang="js">
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/skills/SkillListTile.vue b/app/imports/client/ui/properties/components/skills/SkillListTile.vue
similarity index 90%
rename from app/imports/ui/properties/components/skills/SkillListTile.vue
rename to app/imports/client/ui/properties/components/skills/SkillListTile.vue
index bbcb773e..ec436241 100644
--- a/app/imports/ui/properties/components/skills/SkillListTile.vue
+++ b/app/imports/client/ui/properties/components/skills/SkillListTile.vue
@@ -58,11 +58,11 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
-import RollPopup from '/imports/ui/components/RollPopup.vue';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
+import ProficiencyIcon from '/imports/client/ui/properties/shared/ProficiencyIcon.vue';
+import RollPopup from '/imports/client/ui/components/RollPopup.vue';
 import doCheck from '/imports/api/engine/actions/doCheck.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/skills/SkillProficiency.vue b/app/imports/client/ui/properties/components/skills/SkillProficiency.vue
similarity index 88%
rename from app/imports/ui/properties/components/skills/SkillProficiency.vue
rename to app/imports/client/ui/properties/components/skills/SkillProficiency.vue
index 9d55716a..66b7ed03 100644
--- a/app/imports/ui/properties/components/skills/SkillProficiency.vue
+++ b/app/imports/client/ui/properties/components/skills/SkillProficiency.vue
@@ -41,9 +41,9 @@
 </template>
 
 <script lang="js">
-  import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
-  import Breadcrumbs from '/imports/ui/creature/creatureProperties/Breadcrumbs.vue';
-  import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
+  import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
+  import Breadcrumbs from '/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue';
+  import getProficiencyIcon from '/imports/client/ui/utility/getProficiencyIcon.js';
 
   export default {
     components: {
diff --git a/app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue b/app/imports/client/ui/properties/components/spells/CastSpellWithSlotDialog.vue
similarity index 95%
rename from app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue
rename to app/imports/client/ui/properties/components/spells/CastSpellWithSlotDialog.vue
index dfdc0160..c68d81d7 100644
--- a/app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue
+++ b/app/imports/client/ui/properties/components/spells/CastSpellWithSlotDialog.vue
@@ -186,13 +186,13 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import SplitListLayout from '/imports/ui/properties/components/attributes/SplitListLayout.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import SplitListLayout from '/imports/client/ui/properties/components/attributes/SplitListLayout.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import spellsWithSubheaders from '/imports/ui/properties/components/spells/spellsWithSubheaders.js';
-import SpellSlotListTile from '/imports/ui/properties/components/attributes/SpellSlotListTile.vue';
-import SpellListTile from '/imports/ui/properties/components/spells/SpellListTile.vue';
-import RollPopup from '/imports/ui/components/RollPopup.vue';
+import spellsWithSubheaders from '/imports/client/ui/properties/components/spells/spellsWithSubheaders.js';
+import SpellSlotListTile from '/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue';
+import SpellListTile from '/imports/client/ui/properties/components/spells/SpellListTile.vue';
+import RollPopup from '/imports/client/ui/components/RollPopup.vue';
 import { find } from 'lodash';
 
 const slotFilter = {
diff --git a/app/imports/ui/properties/components/spells/SpellList.vue b/app/imports/client/ui/properties/components/spells/SpellList.vue
similarity index 93%
rename from app/imports/ui/properties/components/spells/SpellList.vue
rename to app/imports/client/ui/properties/components/spells/SpellList.vue
index 50f70bfc..f9271f54 100644
--- a/app/imports/ui/properties/components/spells/SpellList.vue
+++ b/app/imports/client/ui/properties/components/spells/SpellList.vue
@@ -39,9 +39,9 @@
 
 <script lang="js">
 import draggable from 'vuedraggable';
-import SpellListTile from '/imports/ui/properties/components/spells/SpellListTile.vue';
+import SpellListTile from '/imports/client/ui/properties/components/spells/SpellListTile.vue';
 import { organizeDoc } from '/imports/api/parenting/organizeMethods.js';
-import spellsWithSubheaders from '/imports/ui/properties/components/spells/spellsWithSubheaders.js';
+import spellsWithSubheaders from '/imports/client/ui/properties/components/spells/spellsWithSubheaders.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/spells/SpellListCard.vue b/app/imports/client/ui/properties/components/spells/SpellListCard.vue
similarity index 95%
rename from app/imports/ui/properties/components/spells/SpellListCard.vue
rename to app/imports/client/ui/properties/components/spells/SpellListCard.vue
index 4dd5edc4..4474d606 100644
--- a/app/imports/ui/properties/components/spells/SpellListCard.vue
+++ b/app/imports/client/ui/properties/components/spells/SpellListCard.vue
@@ -58,8 +58,8 @@
 </template>
 
 <script lang="js">
-import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
-import SpellList from '/imports/ui/properties/components/spells/SpellList.vue';
+import ToolbarCard from '/imports/client/ui/components/ToolbarCard.vue';
+import SpellList from '/imports/client/ui/properties/components/spells/SpellList.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 
 export default {
diff --git a/app/imports/ui/properties/components/spells/SpellListTile.vue b/app/imports/client/ui/properties/components/spells/SpellListTile.vue
similarity index 96%
rename from app/imports/ui/properties/components/spells/SpellListTile.vue
rename to app/imports/client/ui/properties/components/spells/SpellListTile.vue
index 20122630..6c47536f 100644
--- a/app/imports/ui/properties/components/spells/SpellListTile.vue
+++ b/app/imports/client/ui/properties/components/spells/SpellListTile.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
 
 export default {
diff --git a/app/imports/ui/properties/components/spells/spellsWithSubheaders.js b/app/imports/client/ui/properties/components/spells/spellsWithSubheaders.js
similarity index 100%
rename from app/imports/ui/properties/components/spells/spellsWithSubheaders.js
rename to app/imports/client/ui/properties/components/spells/spellsWithSubheaders.js
diff --git a/app/imports/ui/properties/components/toggles/ToggleCard.vue b/app/imports/client/ui/properties/components/toggles/ToggleCard.vue
similarity index 96%
rename from app/imports/ui/properties/components/toggles/ToggleCard.vue
rename to app/imports/client/ui/properties/components/toggles/ToggleCard.vue
index 207783d8..87b8baca 100644
--- a/app/imports/ui/properties/components/toggles/ToggleCard.vue
+++ b/app/imports/client/ui/properties/components/toggles/ToggleCard.vue
@@ -26,7 +26,7 @@
 
 <script lang="js">
 import flipToggle from '/imports/api/creature/creatureProperties/methods/flipToggle.js';
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
 
   export default {
     components: {
diff --git a/app/imports/ui/properties/forms/ActionForm.vue b/app/imports/client/ui/properties/forms/ActionForm.vue
similarity index 95%
rename from app/imports/ui/properties/forms/ActionForm.vue
rename to app/imports/client/ui/properties/forms/ActionForm.vue
index 3f2e5497..d20c14dd 100644
--- a/app/imports/ui/properties/forms/ActionForm.vue
+++ b/app/imports/client/ui/properties/forms/ActionForm.vue
@@ -177,10 +177,10 @@
 </template>
 
 <script lang="js">
-import ResourcesForm from '/imports/ui/properties/forms/ResourcesForm.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import IconColorMenu from '/imports/ui/properties/forms/shared/IconColorMenu.vue';
-import ResetSelector from '/imports/ui/components/ResetSelector.vue';
+import ResourcesForm from '/imports/client/ui/properties/forms/ResourcesForm.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import IconColorMenu from '/imports/client/ui/properties/forms/shared/IconColorMenu.vue';
+import ResetSelector from '/imports/client/ui/components/ResetSelector.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/AdjustmentForm.vue b/app/imports/client/ui/properties/forms/AdjustmentForm.vue
similarity index 95%
rename from app/imports/ui/properties/forms/AdjustmentForm.vue
rename to app/imports/client/ui/properties/forms/AdjustmentForm.vue
index 31712722..353d4fab 100644
--- a/app/imports/ui/properties/forms/AdjustmentForm.vue
+++ b/app/imports/client/ui/properties/forms/AdjustmentForm.vue
@@ -76,8 +76,8 @@
 </template>
 
 <script lang="js">
-import attributeListMixin from '/imports/ui/properties/forms/shared/lists/attributeListMixin.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import attributeListMixin from '/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin, attributeListMixin],
diff --git a/app/imports/ui/properties/forms/AttributeConsumedForm.vue b/app/imports/client/ui/properties/forms/AttributeConsumedForm.vue
similarity index 82%
rename from app/imports/ui/properties/forms/AttributeConsumedForm.vue
rename to app/imports/client/ui/properties/forms/AttributeConsumedForm.vue
index b7f0421c..87781806 100644
--- a/app/imports/ui/properties/forms/AttributeConsumedForm.vue
+++ b/app/imports/client/ui/properties/forms/AttributeConsumedForm.vue
@@ -31,8 +31,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import attributeListMixin from '/imports/ui/properties/forms/shared/lists/attributeListMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import attributeListMixin from '/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js';
 
 export default {
   mixins: [propertyFormMixin, attributeListMixin],
diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/client/ui/properties/forms/AttributeForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/AttributeForm.vue
rename to app/imports/client/ui/properties/forms/AttributeForm.vue
index 8569e69b..77e66af1 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/client/ui/properties/forms/AttributeForm.vue
@@ -264,11 +264,11 @@
 </template>
 
 <script lang="js">
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
-import FormSections from '/imports/ui/properties/forms/shared/FormSections.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import ColorPicker from '/imports/ui/components/ColorPicker.vue';
-import ResetSelector from '/imports/ui/components/ResetSelector.vue';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import FormSections from '/imports/client/ui/properties/forms/shared/FormSections.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import ColorPicker from '/imports/client/ui/components/ColorPicker.vue';
+import ResetSelector from '/imports/client/ui/components/ResetSelector.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/AttributesConsumedListForm.vue b/app/imports/client/ui/properties/forms/AttributesConsumedListForm.vue
similarity index 82%
rename from app/imports/ui/properties/forms/AttributesConsumedListForm.vue
rename to app/imports/client/ui/properties/forms/AttributesConsumedListForm.vue
index 97ff2d81..6d07a538 100644
--- a/app/imports/ui/properties/forms/AttributesConsumedListForm.vue
+++ b/app/imports/client/ui/properties/forms/AttributesConsumedListForm.vue
@@ -29,8 +29,8 @@
 </template>
 
 <script lang="js">
-import AttributeConsumedForm from '/imports/ui/properties/forms/AttributeConsumedForm.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import AttributeConsumedForm from '/imports/client/ui/properties/forms/AttributeConsumedForm.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/BranchForm.vue b/app/imports/client/ui/properties/forms/BranchForm.vue
similarity index 97%
rename from app/imports/ui/properties/forms/BranchForm.vue
rename to app/imports/client/ui/properties/forms/BranchForm.vue
index 1ad49fb4..8893f57d 100644
--- a/app/imports/ui/properties/forms/BranchForm.vue
+++ b/app/imports/client/ui/properties/forms/BranchForm.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/BuffForm.vue b/app/imports/client/ui/properties/forms/BuffForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/BuffForm.vue
rename to app/imports/client/ui/properties/forms/BuffForm.vue
index ade759e4..965f5810 100644
--- a/app/imports/ui/properties/forms/BuffForm.vue
+++ b/app/imports/client/ui/properties/forms/BuffForm.vue
@@ -98,7 +98,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/BuffRemoverForm.vue b/app/imports/client/ui/properties/forms/BuffRemoverForm.vue
similarity index 98%
rename from app/imports/ui/properties/forms/BuffRemoverForm.vue
rename to app/imports/client/ui/properties/forms/BuffRemoverForm.vue
index ed5845af..abd05c62 100644
--- a/app/imports/ui/properties/forms/BuffRemoverForm.vue
+++ b/app/imports/client/ui/properties/forms/BuffRemoverForm.vue
@@ -135,7 +135,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 import {
   BuffRemoverSchema
 } from '/imports/api/properties/BuffRemovers.js';
diff --git a/app/imports/ui/properties/forms/ClassForm.vue b/app/imports/client/ui/properties/forms/ClassForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/ClassForm.vue
rename to app/imports/client/ui/properties/forms/ClassForm.vue
index f4bd101e..bb715706 100644
--- a/app/imports/ui/properties/forms/ClassForm.vue
+++ b/app/imports/client/ui/properties/forms/ClassForm.vue
@@ -126,8 +126,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 import { SlotSchema } from '/imports/api/properties/Slots.js';
 
diff --git a/app/imports/ui/properties/forms/ClassLevelForm.vue b/app/imports/client/ui/properties/forms/ClassLevelForm.vue
similarity index 95%
rename from app/imports/ui/properties/forms/ClassLevelForm.vue
rename to app/imports/client/ui/properties/forms/ClassLevelForm.vue
index 854380e2..15be3ac0 100644
--- a/app/imports/ui/properties/forms/ClassLevelForm.vue
+++ b/app/imports/client/ui/properties/forms/ClassLevelForm.vue
@@ -66,7 +66,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/ConstantForm.vue b/app/imports/client/ui/properties/forms/ConstantForm.vue
similarity index 88%
rename from app/imports/ui/properties/forms/ConstantForm.vue
rename to app/imports/client/ui/properties/forms/ConstantForm.vue
index 27817bf3..c6c5e07a 100644
--- a/app/imports/ui/properties/forms/ConstantForm.vue
+++ b/app/imports/client/ui/properties/forms/ConstantForm.vue
@@ -35,8 +35,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import CalculationErrorList from '/imports/client/ui/properties/forms/shared/CalculationErrorList.vue';
 import { ConstantSchema } from '/imports/api/properties/Constants.js';
 
 export default {
diff --git a/app/imports/ui/properties/forms/ContainerForm.vue b/app/imports/client/ui/properties/forms/ContainerForm.vue
similarity index 93%
rename from app/imports/ui/properties/forms/ContainerForm.vue
rename to app/imports/client/ui/properties/forms/ContainerForm.vue
index 58f127e0..5cef5978 100644
--- a/app/imports/ui/properties/forms/ContainerForm.vue
+++ b/app/imports/client/ui/properties/forms/ContainerForm.vue
@@ -89,8 +89,8 @@
 </template>
 
 <script lang="js">
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/DamageForm.vue b/app/imports/client/ui/properties/forms/DamageForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/DamageForm.vue
rename to app/imports/client/ui/properties/forms/DamageForm.vue
index 1faa66f3..23d00ad8 100644
--- a/app/imports/ui/properties/forms/DamageForm.vue
+++ b/app/imports/client/ui/properties/forms/DamageForm.vue
@@ -71,7 +71,7 @@
 
 <script lang="js">
 import DAMAGE_TYPES from '/imports/constants/DAMAGE_TYPES.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 
 export default {
diff --git a/app/imports/ui/properties/forms/DamageMultiplierForm.vue b/app/imports/client/ui/properties/forms/DamageMultiplierForm.vue
similarity index 94%
rename from app/imports/ui/properties/forms/DamageMultiplierForm.vue
rename to app/imports/client/ui/properties/forms/DamageMultiplierForm.vue
index 551f1514..130fbc85 100644
--- a/app/imports/ui/properties/forms/DamageMultiplierForm.vue
+++ b/app/imports/client/ui/properties/forms/DamageMultiplierForm.vue
@@ -88,8 +88,8 @@
 </template>
 
 <script lang="js">
-import FormSection, { FormSections } from '/imports/ui/properties/forms/shared/FormSection.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection, { FormSections } from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 import DAMAGE_TYPES from '/imports/constants/DAMAGE_TYPES.js';
 
diff --git a/app/imports/ui/properties/forms/EffectForm.vue b/app/imports/client/ui/properties/forms/EffectForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/EffectForm.vue
rename to app/imports/client/ui/properties/forms/EffectForm.vue
index 694db21d..1d386bf8 100644
--- a/app/imports/ui/properties/forms/EffectForm.vue
+++ b/app/imports/client/ui/properties/forms/EffectForm.vue
@@ -181,11 +181,11 @@
 </template>
 
 <script lang="js">
-import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import attributeListMixin from '/imports/ui/properties/forms/shared/lists/attributeListMixin.js';
+import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import attributeListMixin from '/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js';
 import { EffectSchema } from '/imports/api/properties/Effects.js';
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
 
 const ICON_SPIN_DURATION = 300;
 export default {
diff --git a/app/imports/ui/properties/forms/FeatureForm.vue b/app/imports/client/ui/properties/forms/FeatureForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/FeatureForm.vue
rename to app/imports/client/ui/properties/forms/FeatureForm.vue
index c3f85735..10aa74fd 100644
--- a/app/imports/ui/properties/forms/FeatureForm.vue
+++ b/app/imports/client/ui/properties/forms/FeatureForm.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/FolderForm.vue b/app/imports/client/ui/properties/forms/FolderForm.vue
similarity index 86%
rename from app/imports/ui/properties/forms/FolderForm.vue
rename to app/imports/client/ui/properties/forms/FolderForm.vue
index b616505e..d12a7439 100644
--- a/app/imports/ui/properties/forms/FolderForm.vue
+++ b/app/imports/client/ui/properties/forms/FolderForm.vue
@@ -39,8 +39,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/ItemConsumedForm.vue b/app/imports/client/ui/properties/forms/ItemConsumedForm.vue
similarity index 89%
rename from app/imports/ui/properties/forms/ItemConsumedForm.vue
rename to app/imports/client/ui/properties/forms/ItemConsumedForm.vue
index d65fd6bc..dad6139b 100644
--- a/app/imports/ui/properties/forms/ItemConsumedForm.vue
+++ b/app/imports/client/ui/properties/forms/ItemConsumedForm.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/ItemForm.vue b/app/imports/client/ui/properties/forms/ItemForm.vue
similarity index 95%
rename from app/imports/ui/properties/forms/ItemForm.vue
rename to app/imports/client/ui/properties/forms/ItemForm.vue
index d8097daa..45ef9e5c 100644
--- a/app/imports/ui/properties/forms/ItemForm.vue
+++ b/app/imports/client/ui/properties/forms/ItemForm.vue
@@ -154,8 +154,8 @@
 </template>
 
 <script lang="js">
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/ItemsConsumedListForm.vue b/app/imports/client/ui/properties/forms/ItemsConsumedListForm.vue
similarity index 82%
rename from app/imports/ui/properties/forms/ItemsConsumedListForm.vue
rename to app/imports/client/ui/properties/forms/ItemsConsumedListForm.vue
index 97531ec6..5ccea76d 100644
--- a/app/imports/ui/properties/forms/ItemsConsumedListForm.vue
+++ b/app/imports/client/ui/properties/forms/ItemsConsumedListForm.vue
@@ -29,8 +29,8 @@
 </template>
 
 <script lang="js">
-import ItemConsumedForm from '/imports/ui/properties/forms/ItemConsumedForm.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import ItemConsumedForm from '/imports/client/ui/properties/forms/ItemConsumedForm.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/NoteForm.vue b/app/imports/client/ui/properties/forms/NoteForm.vue
similarity index 93%
rename from app/imports/ui/properties/forms/NoteForm.vue
rename to app/imports/client/ui/properties/forms/NoteForm.vue
index ba9eeafd..36d693bb 100644
--- a/app/imports/ui/properties/forms/NoteForm.vue
+++ b/app/imports/client/ui/properties/forms/NoteForm.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/PointBuyForm.vue b/app/imports/client/ui/properties/forms/PointBuyForm.vue
similarity index 93%
rename from app/imports/ui/properties/forms/PointBuyForm.vue
rename to app/imports/client/ui/properties/forms/PointBuyForm.vue
index 41426acb..4698559d 100644
--- a/app/imports/ui/properties/forms/PointBuyForm.vue
+++ b/app/imports/client/ui/properties/forms/PointBuyForm.vue
@@ -176,11 +176,11 @@
 </template>
 
 <script lang="js">
-import attributeListMixin from '/imports/ui/properties/forms/shared/lists/attributeListMixin.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import attributeListMixin from '/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 import { PointBuySchema } from '/imports/api/properties/PointBuys.js';
-import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
-import PointBuySpendForm from '/imports/ui/properties/forms/PointBuySpendForm.vue';
+import CalculationErrorList from '/imports/client/ui/properties/forms/shared/CalculationErrorList.vue';
+import PointBuySpendForm from '/imports/client/ui/properties/forms/PointBuySpendForm.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/PointBuySpendForm.vue b/app/imports/client/ui/properties/forms/PointBuySpendForm.vue
similarity index 92%
rename from app/imports/ui/properties/forms/PointBuySpendForm.vue
rename to app/imports/client/ui/properties/forms/PointBuySpendForm.vue
index 403cd927..5103a69b 100644
--- a/app/imports/ui/properties/forms/PointBuySpendForm.vue
+++ b/app/imports/client/ui/properties/forms/PointBuySpendForm.vue
@@ -88,8 +88,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import CalculationErrorList from '/imports/client/ui/properties/forms/shared/CalculationErrorList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/ProficiencyForm.vue b/app/imports/client/ui/properties/forms/ProficiencyForm.vue
similarity index 82%
rename from app/imports/ui/properties/forms/ProficiencyForm.vue
rename to app/imports/client/ui/properties/forms/ProficiencyForm.vue
index 4fcf2825..a8a18d09 100644
--- a/app/imports/ui/properties/forms/ProficiencyForm.vue
+++ b/app/imports/client/ui/properties/forms/ProficiencyForm.vue
@@ -48,9 +48,9 @@
 </template>
 
 <script lang="js">
-import ProficiencySelect from '/imports/ui/properties/forms/shared/ProficiencySelect.vue';
-import skillListMixin from '/imports/ui/properties/forms/shared/lists/skillListMixin.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import ProficiencySelect from '/imports/client/ui/properties/forms/shared/ProficiencySelect.vue';
+import skillListMixin from '/imports/client/ui/properties/forms/shared/lists/skillListMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/ReferenceForm.vue b/app/imports/client/ui/properties/forms/ReferenceForm.vue
similarity index 88%
rename from app/imports/ui/properties/forms/ReferenceForm.vue
rename to app/imports/client/ui/properties/forms/ReferenceForm.vue
index 8c580322..88032c03 100644
--- a/app/imports/ui/properties/forms/ReferenceForm.vue
+++ b/app/imports/client/ui/properties/forms/ReferenceForm.vue
@@ -33,10 +33,10 @@
 </template>
 
 <script lang="js">
-  import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-  import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+  import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
+  import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
   import updateReferenceNode from '/imports/api/library/methods/updateReferenceNode.js';
-  import PropertyField from '/imports/ui/properties/viewers/shared/PropertyField.vue';
+  import PropertyField from '/imports/client/ui/properties/viewers/shared/PropertyField.vue';
 
   export default {
     components: {
diff --git a/app/imports/ui/properties/forms/ResourcesForm.vue b/app/imports/client/ui/properties/forms/ResourcesForm.vue
similarity index 90%
rename from app/imports/ui/properties/forms/ResourcesForm.vue
rename to app/imports/client/ui/properties/forms/ResourcesForm.vue
index e3fc0dcb..a5d80f35 100644
--- a/app/imports/ui/properties/forms/ResourcesForm.vue
+++ b/app/imports/client/ui/properties/forms/ResourcesForm.vue
@@ -55,9 +55,9 @@
 </template>
 
 <script lang="js">
-import AttributesConsumedListForm from '/imports/ui/properties/forms/AttributesConsumedListForm.vue';
-import ItemsConsumedListForm from '/imports/ui/properties/forms/ItemsConsumedListForm.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import AttributesConsumedListForm from '/imports/client/ui/properties/forms/AttributesConsumedListForm.vue';
+import ItemsConsumedListForm from '/imports/client/ui/properties/forms/ItemsConsumedListForm.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/RollForm.vue b/app/imports/client/ui/properties/forms/RollForm.vue
similarity index 92%
rename from app/imports/ui/properties/forms/RollForm.vue
rename to app/imports/client/ui/properties/forms/RollForm.vue
index c06ceaa6..87b4664a 100644
--- a/app/imports/ui/properties/forms/RollForm.vue
+++ b/app/imports/client/ui/properties/forms/RollForm.vue
@@ -72,8 +72,8 @@
 </template>
 
 <script lang="js">
-import FormSection, { FormSections } from '/imports/ui/properties/forms/shared/FormSection.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection, { FormSections } from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/SavingThrowForm.vue b/app/imports/client/ui/properties/forms/SavingThrowForm.vue
similarity index 93%
rename from app/imports/ui/properties/forms/SavingThrowForm.vue
rename to app/imports/client/ui/properties/forms/SavingThrowForm.vue
index 8e0c5540..b2bd4cf5 100644
--- a/app/imports/ui/properties/forms/SavingThrowForm.vue
+++ b/app/imports/client/ui/properties/forms/SavingThrowForm.vue
@@ -82,8 +82,8 @@
 </template>
 
 <script lang="js">
-import saveListMixin from '/imports/ui/properties/forms/shared/lists/saveListMixin.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import saveListMixin from '/imports/client/ui/properties/forms/shared/lists/saveListMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [saveListMixin, propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/SkillForm.vue b/app/imports/client/ui/properties/forms/SkillForm.vue
similarity index 91%
rename from app/imports/ui/properties/forms/SkillForm.vue
rename to app/imports/client/ui/properties/forms/SkillForm.vue
index 91d30970..e7c2ab54 100644
--- a/app/imports/ui/properties/forms/SkillForm.vue
+++ b/app/imports/client/ui/properties/forms/SkillForm.vue
@@ -85,10 +85,10 @@
 </template>
 
 <script lang="js">
-import ProficiencySelect from '/imports/ui/properties/forms/shared/ProficiencySelect.vue';
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
-import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import ProficiencySelect from '/imports/client/ui/properties/forms/shared/ProficiencySelect.vue';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import createListOfProperties from '/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/SlotFillerForm.vue b/app/imports/client/ui/properties/forms/SlotFillerForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/SlotFillerForm.vue
rename to app/imports/client/ui/properties/forms/SlotFillerForm.vue
index 28890a30..88e0f350 100644
--- a/app/imports/ui/properties/forms/SlotFillerForm.vue
+++ b/app/imports/client/ui/properties/forms/SlotFillerForm.vue
@@ -95,7 +95,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/properties/forms/SlotForm.vue b/app/imports/client/ui/properties/forms/SlotForm.vue
similarity index 97%
rename from app/imports/ui/properties/forms/SlotForm.vue
rename to app/imports/client/ui/properties/forms/SlotForm.vue
index f2dc7c9b..e973932b 100644
--- a/app/imports/ui/properties/forms/SlotForm.vue
+++ b/app/imports/client/ui/properties/forms/SlotForm.vue
@@ -200,8 +200,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 import { SlotSchema } from '/imports/api/properties/Slots.js';
 
diff --git a/app/imports/ui/properties/forms/SpellForm.vue b/app/imports/client/ui/properties/forms/SpellForm.vue
similarity index 95%
rename from app/imports/ui/properties/forms/SpellForm.vue
rename to app/imports/client/ui/properties/forms/SpellForm.vue
index ee03d9ba..14c06817 100644
--- a/app/imports/ui/properties/forms/SpellForm.vue
+++ b/app/imports/client/ui/properties/forms/SpellForm.vue
@@ -309,11 +309,11 @@
 </template>
 
 <script lang="js">
-import FormSection, { FormSections } from '/imports/ui/properties/forms/shared/FormSection.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import IconColorMenu from '/imports/ui/properties/forms/shared/IconColorMenu.vue';
-import ResourcesForm from '/imports/ui/properties/forms/ResourcesForm.vue';
-import ResetSelector from '/imports/ui/components/ResetSelector.vue';
+import FormSection, { FormSections } from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import IconColorMenu from '/imports/client/ui/properties/forms/shared/IconColorMenu.vue';
+import ResourcesForm from '/imports/client/ui/properties/forms/ResourcesForm.vue';
+import ResetSelector from '/imports/client/ui/components/ResetSelector.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/SpellListForm.vue b/app/imports/client/ui/properties/forms/SpellListForm.vue
similarity index 93%
rename from app/imports/ui/properties/forms/SpellListForm.vue
rename to app/imports/client/ui/properties/forms/SpellListForm.vue
index 3855b78a..182a599e 100644
--- a/app/imports/ui/properties/forms/SpellListForm.vue
+++ b/app/imports/client/ui/properties/forms/SpellListForm.vue
@@ -75,8 +75,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import createListOfProperties from '/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/ToggleForm.vue b/app/imports/client/ui/properties/forms/ToggleForm.vue
similarity index 97%
rename from app/imports/ui/properties/forms/ToggleForm.vue
rename to app/imports/client/ui/properties/forms/ToggleForm.vue
index 5f98729c..3a9f80fe 100644
--- a/app/imports/ui/properties/forms/ToggleForm.vue
+++ b/app/imports/client/ui/properties/forms/ToggleForm.vue
@@ -94,7 +94,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/TriggerForm.vue b/app/imports/client/ui/properties/forms/TriggerForm.vue
similarity index 97%
rename from app/imports/ui/properties/forms/TriggerForm.vue
rename to app/imports/client/ui/properties/forms/TriggerForm.vue
index d48932a7..c8dcc4af 100644
--- a/app/imports/ui/properties/forms/TriggerForm.vue
+++ b/app/imports/client/ui/properties/forms/TriggerForm.vue
@@ -152,8 +152,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
 import {
   TriggerSchema, eventOptions, timingOptions, actionPropertyTypeOptions
 } from '/imports/api/properties/Triggers.js';
diff --git a/app/imports/ui/properties/forms/shared/CalculationErrorList.vue b/app/imports/client/ui/properties/forms/shared/CalculationErrorList.vue
similarity index 100%
rename from app/imports/ui/properties/forms/shared/CalculationErrorList.vue
rename to app/imports/client/ui/properties/forms/shared/CalculationErrorList.vue
diff --git a/app/imports/ui/properties/forms/shared/ComputedField.vue b/app/imports/client/ui/properties/forms/shared/ComputedField.vue
similarity index 91%
rename from app/imports/ui/properties/forms/shared/ComputedField.vue
rename to app/imports/client/ui/properties/forms/shared/ComputedField.vue
index 9d3ac194..85bfc0d8 100644
--- a/app/imports/ui/properties/forms/shared/ComputedField.vue
+++ b/app/imports/client/ui/properties/forms/shared/ComputedField.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script lang="js">
-import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
+import CalculationErrorList from '/imports/client/ui/properties/forms/shared/CalculationErrorList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/shared/FormSection.vue b/app/imports/client/ui/properties/forms/shared/FormSection.vue
similarity index 89%
rename from app/imports/ui/properties/forms/shared/FormSection.vue
rename to app/imports/client/ui/properties/forms/shared/FormSection.vue
index 88c8c279..378024f5 100644
--- a/app/imports/ui/properties/forms/shared/FormSection.vue
+++ b/app/imports/client/ui/properties/forms/shared/FormSection.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script lang="js">
-import FormSections from '/imports/ui/properties/forms/shared/FormSections.vue';
+import FormSections from '/imports/client/ui/properties/forms/shared/FormSections.vue';
 export default {
   components: {
     FormSections,
diff --git a/app/imports/ui/properties/forms/shared/FormSections.vue b/app/imports/client/ui/properties/forms/shared/FormSections.vue
similarity index 100%
rename from app/imports/ui/properties/forms/shared/FormSections.vue
rename to app/imports/client/ui/properties/forms/shared/FormSections.vue
diff --git a/app/imports/ui/properties/forms/shared/IconColorMenu.vue b/app/imports/client/ui/properties/forms/shared/IconColorMenu.vue
similarity index 83%
rename from app/imports/ui/properties/forms/shared/IconColorMenu.vue
rename to app/imports/client/ui/properties/forms/shared/IconColorMenu.vue
index 820cd3a6..aa58ed16 100644
--- a/app/imports/ui/properties/forms/shared/IconColorMenu.vue
+++ b/app/imports/client/ui/properties/forms/shared/IconColorMenu.vue
@@ -21,8 +21,8 @@
 </template>
 
 <script lang="js">
-  import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
-  import ColorPicker from '/imports/ui/components/ColorPicker.vue';
+  import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
+  import ColorPicker from '/imports/client/ui/components/ColorPicker.vue';
 
   export default {
     components: {
diff --git a/app/imports/ui/properties/forms/shared/InlineComputationField.vue b/app/imports/client/ui/properties/forms/shared/InlineComputationField.vue
similarity index 91%
rename from app/imports/ui/properties/forms/shared/InlineComputationField.vue
rename to app/imports/client/ui/properties/forms/shared/InlineComputationField.vue
index bbd88d8f..def4fb0b 100644
--- a/app/imports/ui/properties/forms/shared/InlineComputationField.vue
+++ b/app/imports/client/ui/properties/forms/shared/InlineComputationField.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script lang="js">
-import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
+import CalculationErrorList from '/imports/client/ui/properties/forms/shared/CalculationErrorList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/shared/ProficiencySelect.vue b/app/imports/client/ui/properties/forms/shared/ProficiencySelect.vue
similarity index 95%
rename from app/imports/ui/properties/forms/shared/ProficiencySelect.vue
rename to app/imports/client/ui/properties/forms/shared/ProficiencySelect.vue
index 1af7095a..a806602a 100644
--- a/app/imports/ui/properties/forms/shared/ProficiencySelect.vue
+++ b/app/imports/client/ui/properties/forms/shared/ProficiencySelect.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script lang="js">
-  import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
+  import getProficiencyIcon from '/imports/client/ui/utility/getProficiencyIcon.js';
 
   const ICON_SPIN_DURATION = 300;
 
diff --git a/app/imports/ui/properties/forms/shared/lists/attributeListMixin.js b/app/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js
similarity index 62%
rename from app/imports/ui/properties/forms/shared/lists/attributeListMixin.js
rename to app/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js
index 3ae537ba..22453e21 100644
--- a/app/imports/ui/properties/forms/shared/lists/attributeListMixin.js
+++ b/app/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js
@@ -1,4 +1,4 @@
-import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js';
+import createListOfProperties from '/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js';
 
 const attributeListMixin = {
   meteor: {
diff --git a/app/imports/ui/properties/forms/shared/lists/createListOfProperties.js b/app/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js
similarity index 100%
rename from app/imports/ui/properties/forms/shared/lists/createListOfProperties.js
rename to app/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js
diff --git a/app/imports/ui/properties/forms/shared/lists/saveListMixin.js b/app/imports/client/ui/properties/forms/shared/lists/saveListMixin.js
similarity index 60%
rename from app/imports/ui/properties/forms/shared/lists/saveListMixin.js
rename to app/imports/client/ui/properties/forms/shared/lists/saveListMixin.js
index 035817f6..99d96d45 100644
--- a/app/imports/ui/properties/forms/shared/lists/saveListMixin.js
+++ b/app/imports/client/ui/properties/forms/shared/lists/saveListMixin.js
@@ -1,4 +1,4 @@
-import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js'
+import createListOfProperties from '/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js'
 
 const saveListMixin = {
   meteor: {
diff --git a/app/imports/ui/properties/forms/shared/lists/skillListMixin.js b/app/imports/client/ui/properties/forms/shared/lists/skillListMixin.js
similarity index 58%
rename from app/imports/ui/properties/forms/shared/lists/skillListMixin.js
rename to app/imports/client/ui/properties/forms/shared/lists/skillListMixin.js
index 69d12256..2c90ff87 100644
--- a/app/imports/ui/properties/forms/shared/lists/skillListMixin.js
+++ b/app/imports/client/ui/properties/forms/shared/lists/skillListMixin.js
@@ -1,4 +1,4 @@
-import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js'
+import createListOfProperties from '/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js'
 
 const skillListMixin = {
   meteor: {
diff --git a/app/imports/client/ui/properties/forms/shared/propertyFormIndex.js b/app/imports/client/ui/properties/forms/shared/propertyFormIndex.js
new file mode 100644
index 00000000..28cf4172
--- /dev/null
+++ b/app/imports/client/ui/properties/forms/shared/propertyFormIndex.js
@@ -0,0 +1,61 @@
+import ActionForm from '/imports/client/ui/properties/forms/ActionForm.vue';
+import AdjustmentForm from '/imports/client/ui/properties/forms/AdjustmentForm.vue';
+import AttributeForm from '/imports/client/ui/properties/forms/AttributeForm.vue';
+import BuffForm from '/imports/client/ui/properties/forms/BuffForm.vue';
+import BuffRemoverForm from '/imports/client/ui/properties/forms/BuffRemoverForm.vue';
+import BranchForm from '/imports/client/ui/properties/forms/BranchForm.vue';
+import ClassForm from '/imports/client/ui/properties/forms/ClassForm.vue';
+import ClassLevelForm from '/imports/client/ui/properties/forms/ClassLevelForm.vue';
+import ConstantForm from '/imports/client/ui/properties/forms/ConstantForm.vue';
+import ContainerForm from '/imports/client/ui/properties/forms/ContainerForm.vue';
+import DamageForm from '/imports/client/ui/properties/forms/DamageForm.vue';
+import DamageMultiplierForm from '/imports/client/ui/properties/forms/DamageMultiplierForm.vue';
+import EffectForm from '/imports/client/ui/properties/forms/EffectForm.vue';
+import FeatureForm from '/imports/client/ui/properties/forms/FeatureForm.vue';
+import FolderForm from '/imports/client/ui/properties/forms/FolderForm.vue';
+import ItemForm from '/imports/client/ui/properties/forms/ItemForm.vue';
+import NoteForm from '/imports/client/ui/properties/forms/NoteForm.vue';
+import PointBuyForm from '/imports/client/ui/properties/forms/PointBuyForm.vue';
+import ProficiencyForm from '/imports/client/ui/properties/forms/ProficiencyForm.vue';
+import ReferenceForm from '/imports/client/ui/properties/forms/ReferenceForm.vue';
+import RollForm from '/imports/client/ui/properties/forms/RollForm.vue';
+import SavingThrowForm from '/imports/client/ui/properties/forms/SavingThrowForm.vue';
+import SkillForm from '/imports/client/ui/properties/forms/SkillForm.vue';
+import SlotForm from '/imports/client/ui/properties/forms/SlotForm.vue';
+import SlotFillerForm from '/imports/client/ui/properties/forms/SlotFillerForm.vue';
+import SpellListForm from '/imports/client/ui/properties/forms/SpellListForm.vue';
+import SpellForm from '/imports/client/ui/properties/forms/SpellForm.vue';
+import ToggleForm from '/imports/client/ui/properties/forms/ToggleForm.vue';
+import TriggerForm from '/imports/client/ui/properties/forms/TriggerForm.vue';
+
+export default {
+  action: ActionForm,
+  adjustment: AdjustmentForm,
+  attribute: AttributeForm,
+  buff: BuffForm,
+  buffRemover: BuffRemoverForm,
+  branch: BranchForm,
+  constant: ConstantForm,
+  container: ContainerForm,
+  class: ClassForm,
+  classLevel: ClassLevelForm,
+  damage: DamageForm,
+  damageMultiplier: DamageMultiplierForm,
+  effect: EffectForm,
+  feature: FeatureForm,
+  folder: FolderForm,
+  item: ItemForm,
+  note: NoteForm,
+  pointBuy: PointBuyForm,
+  proficiency: ProficiencyForm,
+  propertySlot: SlotForm,
+  reference: ReferenceForm,
+  roll: RollForm,
+  savingThrow: SavingThrowForm,
+  skill: SkillForm,
+  slotFiller: SlotFillerForm,
+  spellList: SpellListForm,
+  spell: SpellForm,
+  toggle: ToggleForm,
+  trigger: TriggerForm,
+};
diff --git a/app/imports/ui/properties/forms/shared/propertyFormMixin.js b/app/imports/client/ui/properties/forms/shared/propertyFormMixin.js
similarity index 70%
rename from app/imports/ui/properties/forms/shared/propertyFormMixin.js
rename to app/imports/client/ui/properties/forms/shared/propertyFormMixin.js
index 172db58f..58c3ec28 100644
--- a/app/imports/ui/properties/forms/shared/propertyFormMixin.js
+++ b/app/imports/client/ui/properties/forms/shared/propertyFormMixin.js
@@ -1,6 +1,6 @@
-import ComputedField from '/imports/ui/properties/forms/shared/ComputedField.vue';
-import InlineComputationField from '/imports/ui/properties/forms/shared/InlineComputationField.vue';
-import FormSection, { FormSections } from '/imports/ui/properties/forms/shared/FormSection.vue';
+import ComputedField from '/imports/client/ui/properties/forms/shared/ComputedField.vue';
+import InlineComputationField from '/imports/client/ui/properties/forms/shared/InlineComputationField.vue';
+import FormSection, { FormSections } from '/imports/client/ui/properties/forms/shared/FormSection.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/shared/schemaFormMixin.js b/app/imports/client/ui/properties/forms/shared/schemaFormMixin.js
similarity index 100%
rename from app/imports/ui/properties/forms/shared/schemaFormMixin.js
rename to app/imports/client/ui/properties/forms/shared/schemaFormMixin.js
diff --git a/app/imports/ui/properties/shared/ProficiencyIcon.vue b/app/imports/client/ui/properties/shared/ProficiencyIcon.vue
similarity index 79%
rename from app/imports/ui/properties/shared/ProficiencyIcon.vue
rename to app/imports/client/ui/properties/shared/ProficiencyIcon.vue
index 223ef725..fc2c1620 100644
--- a/app/imports/ui/properties/shared/ProficiencyIcon.vue
+++ b/app/imports/client/ui/properties/shared/ProficiencyIcon.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script lang="js">
-import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
+import getProficiencyIcon from '/imports/client/ui/utility/getProficiencyIcon.js';
 
 export default {
   props: {
diff --git a/app/imports/ui/properties/shared/PropertyIcon.vue b/app/imports/client/ui/properties/shared/PropertyIcon.vue
similarity index 100%
rename from app/imports/ui/properties/shared/PropertyIcon.vue
rename to app/imports/client/ui/properties/shared/PropertyIcon.vue
diff --git a/app/imports/ui/properties/shared/PropertySelectCard.vue b/app/imports/client/ui/properties/shared/PropertySelectCard.vue
similarity index 100%
rename from app/imports/ui/properties/shared/PropertySelectCard.vue
rename to app/imports/client/ui/properties/shared/PropertySelectCard.vue
diff --git a/app/imports/ui/properties/shared/PropertySelector.vue b/app/imports/client/ui/properties/shared/PropertySelector.vue
similarity index 96%
rename from app/imports/ui/properties/shared/PropertySelector.vue
rename to app/imports/client/ui/properties/shared/PropertySelector.vue
index 8fc32b7e..5104a6c8 100644
--- a/app/imports/ui/properties/shared/PropertySelector.vue
+++ b/app/imports/client/ui/properties/shared/PropertySelector.vue
@@ -57,7 +57,7 @@
 
 <script lang="js">
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
-import PropertySelectCard from '/imports/ui/properties/shared/PropertySelectCard.vue';
+import PropertySelectCard from '/imports/client/ui/properties/shared/PropertySelectCard.vue';
 export default {
   components: {
     PropertySelectCard,
diff --git a/app/imports/ui/properties/shared/PropertyViewer.vue b/app/imports/client/ui/properties/shared/PropertyViewer.vue
similarity index 82%
rename from app/imports/ui/properties/shared/PropertyViewer.vue
rename to app/imports/client/ui/properties/shared/PropertyViewer.vue
index 78b3c4d7..20a3aeed 100644
--- a/app/imports/ui/properties/shared/PropertyViewer.vue
+++ b/app/imports/client/ui/properties/shared/PropertyViewer.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerIndex from '/imports/ui/properties/viewers/shared/propertyViewerIndex.js';
+import propertyViewerIndex from '/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js';
 export default {
   components: {
     ...propertyViewerIndex,
diff --git a/app/imports/ui/properties/shared/SelectablePropertyDialog.vue b/app/imports/client/ui/properties/shared/SelectablePropertyDialog.vue
similarity index 88%
rename from app/imports/ui/properties/shared/SelectablePropertyDialog.vue
rename to app/imports/client/ui/properties/shared/SelectablePropertyDialog.vue
index e5b7d28d..a8a34386 100644
--- a/app/imports/ui/properties/shared/SelectablePropertyDialog.vue
+++ b/app/imports/client/ui/properties/shared/SelectablePropertyDialog.vue
@@ -37,9 +37,9 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import PropertySelector from '/imports/ui/properties/shared/PropertySelector.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import PropertySelector from '/imports/client/ui/properties/shared/PropertySelector.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/shared/getPropertyTitle.js b/app/imports/client/ui/properties/shared/getPropertyTitle.js
similarity index 100%
rename from app/imports/ui/properties/shared/getPropertyTitle.js
rename to app/imports/client/ui/properties/shared/getPropertyTitle.js
diff --git a/app/imports/ui/properties/treeNodeViews/AdjustmentTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/AdjustmentTreeNode.vue
similarity index 91%
rename from app/imports/ui/properties/treeNodeViews/AdjustmentTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/AdjustmentTreeNode.vue
index d29333d2..fcfaadf5 100644
--- a/app/imports/ui/properties/treeNodeViews/AdjustmentTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/AdjustmentTreeNode.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 
 export default {
   mixins: [treeNodeViewMixin],
diff --git a/app/imports/ui/properties/treeNodeViews/BranchTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/BranchTreeNode.vue
similarity index 90%
rename from app/imports/ui/properties/treeNodeViews/BranchTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/BranchTreeNode.vue
index 65f488b5..3fe77bfc 100644
--- a/app/imports/ui/properties/treeNodeViews/BranchTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/BranchTreeNode.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 
 export default {
   mixins: [treeNodeViewMixin],
diff --git a/app/imports/ui/properties/treeNodeViews/ClassLevelTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/ClassLevelTreeNode.vue
similarity index 81%
rename from app/imports/ui/properties/treeNodeViews/ClassLevelTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/ClassLevelTreeNode.vue
index ddb49eb0..29163b87 100644
--- a/app/imports/ui/properties/treeNodeViews/ClassLevelTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/ClassLevelTreeNode.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 
 export default {
   mixins: [treeNodeViewMixin],
diff --git a/app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/DamageTreeNode.vue
similarity index 89%
rename from app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/DamageTreeNode.vue
index 9c3ce1d1..3ae28644 100644
--- a/app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/DamageTreeNode.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import { getPropertyIcon } from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/properties/treeNodeViews/DefaultTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/DefaultTreeNode.vue
similarity index 80%
rename from app/imports/ui/properties/treeNodeViews/DefaultTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/DefaultTreeNode.vue
index 1f35c7b9..d7a7045f 100644
--- a/app/imports/ui/properties/treeNodeViews/DefaultTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/DefaultTreeNode.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 
 export default {
   mixins: [treeNodeViewMixin],
diff --git a/app/imports/ui/properties/treeNodeViews/EffectTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/EffectTreeNode.vue
similarity index 93%
rename from app/imports/ui/properties/treeNodeViews/EffectTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/EffectTreeNode.vue
index 60d22b14..bbca7ad0 100644
--- a/app/imports/ui/properties/treeNodeViews/EffectTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/EffectTreeNode.vue
@@ -36,8 +36,8 @@
 
 <script lang="js">
 // Most of this was copied from EffectViewer and should probably be generalised
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
-import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
 
 export default {
   mixins: [treeNodeViewMixin],
diff --git a/app/imports/ui/properties/treeNodeViews/ItemTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/ItemTreeNode.vue
similarity index 92%
rename from app/imports/ui/properties/treeNodeViews/ItemTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/ItemTreeNode.vue
index e28ba0e9..86a01b3c 100644
--- a/app/imports/ui/properties/treeNodeViews/ItemTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/ItemTreeNode.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/ProficiencyTreeNode.vue
similarity index 79%
rename from app/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/ProficiencyTreeNode.vue
index b47828b5..c3142760 100644
--- a/app/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/ProficiencyTreeNode.vue
@@ -20,8 +20,8 @@
 
 <script lang="js">
 // Most of this was copied from EffectViewer and should probably be generalised
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
-import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import ProficiencyIcon from '/imports/client/ui/properties/shared/ProficiencyIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/treeNodeViews/ReferenceTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/ReferenceTreeNode.vue
similarity index 75%
rename from app/imports/ui/properties/treeNodeViews/ReferenceTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/ReferenceTreeNode.vue
index 05579e0d..98b21aba 100644
--- a/app/imports/ui/properties/treeNodeViews/ReferenceTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/ReferenceTreeNode.vue
@@ -21,13 +21,13 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 
 export default {
   name: 'ReferenceTreeNode',
   mixins: [treeNodeViewMixin],
   beforeCreate () {
-    this.$options.components.TreeNodeView = require('/imports/ui/properties/treeNodeViews/TreeNodeView.vue').default
+    this.$options.components.TreeNodeView = require('/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue').default
   },
 }
 </script>
diff --git a/app/imports/ui/properties/treeNodeViews/SavingThrowTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/SavingThrowTreeNode.vue
similarity index 89%
rename from app/imports/ui/properties/treeNodeViews/SavingThrowTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/SavingThrowTreeNode.vue
index 10767f99..63bbdbe5 100644
--- a/app/imports/ui/properties/treeNodeViews/SavingThrowTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/SavingThrowTreeNode.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/properties/treeNodeViews/TreeNodeView.vue b/app/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue
similarity index 86%
rename from app/imports/ui/properties/treeNodeViews/TreeNodeView.vue
rename to app/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue
index 65a18e0e..0da1e0ce 100644
--- a/app/imports/ui/properties/treeNodeViews/TreeNodeView.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewIndex from '/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js';
+import treeNodeViewIndex from '/imports/client/ui/properties/treeNodeViews/treeNodeViewIndex.js';
 
 export default {
   name: 'TreeNodeView',
diff --git a/app/imports/client/ui/properties/treeNodeViews/treeNodeViewIndex.js b/app/imports/client/ui/properties/treeNodeViews/treeNodeViewIndex.js
new file mode 100644
index 00000000..00cbc42d
--- /dev/null
+++ b/app/imports/client/ui/properties/treeNodeViews/treeNodeViewIndex.js
@@ -0,0 +1,23 @@
+import DefaultTreeNode from '/imports/client/ui/properties/treeNodeViews/DefaultTreeNode.vue';
+import AdjustmentTreeNode from '/imports/client/ui/properties/treeNodeViews/AdjustmentTreeNode.vue';
+import BranchTreeNode from '/imports/client/ui/properties/treeNodeViews/BranchTreeNode.vue';
+import ItemTreeNode from '/imports/client/ui/properties/treeNodeViews/ItemTreeNode.vue';
+import DamageTreeNode from '/imports/client/ui/properties/treeNodeViews/DamageTreeNode.vue';
+import EffectTreeNode from '/imports/client/ui/properties/treeNodeViews/EffectTreeNode.vue';
+import ClassLevelTreeNode from '/imports/client/ui/properties/treeNodeViews/ClassLevelTreeNode.vue';
+import ProficiencyTreeNode from '/imports/client/ui/properties/treeNodeViews/ProficiencyTreeNode.vue';
+import ReferenceTreeNode from '/imports/client/ui/properties/treeNodeViews/ReferenceTreeNode.vue';
+import SavingThrowTreeNode from '/imports/client/ui/properties/treeNodeViews/SavingThrowTreeNode.vue';
+
+export default {
+  default: DefaultTreeNode,
+  adjustment: AdjustmentTreeNode,
+  branch: BranchTreeNode,
+  classLevel: ClassLevelTreeNode,
+  damage: DamageTreeNode,
+  effect: EffectTreeNode,
+  item: ItemTreeNode,
+  proficiency: ProficiencyTreeNode,
+  reference: ReferenceTreeNode,
+  savingThrow: SavingThrowTreeNode,
+}
diff --git a/app/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js b/app/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js
similarity index 84%
rename from app/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js
rename to app/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js
index 6716510b..3a3132ba 100644
--- a/app/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js
+++ b/app/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js
@@ -1,5 +1,5 @@
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/ActionViewer.vue b/app/imports/client/ui/properties/viewers/ActionViewer.vue
similarity index 92%
rename from app/imports/ui/properties/viewers/ActionViewer.vue
rename to app/imports/client/ui/properties/viewers/ActionViewer.vue
index e9f49f6b..b76c1b4c 100644
--- a/app/imports/ui/properties/viewers/ActionViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ActionViewer.vue
@@ -105,14 +105,14 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
 import doAction from '/imports/api/engine/actions/doAction.js';
-import AttributeConsumedView from '/imports/ui/properties/components/actions/AttributeConsumedView.vue';
-import ItemConsumedView from '/imports/ui/properties/components/actions/ItemConsumedView.vue';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
+import AttributeConsumedView from '/imports/client/ui/properties/components/actions/AttributeConsumedView.vue';
+import ItemConsumedView from '/imports/client/ui/properties/components/actions/ItemConsumedView.vue';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
 import doCastSpell from '/imports/api/engine/actions/doCastSpell.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/AdjustmentViewer.vue b/app/imports/client/ui/properties/viewers/AdjustmentViewer.vue
similarity index 90%
rename from app/imports/ui/properties/viewers/AdjustmentViewer.vue
rename to app/imports/client/ui/properties/viewers/AdjustmentViewer.vue
index d5fd2694..9ae163d1 100644
--- a/app/imports/ui/properties/viewers/AdjustmentViewer.vue
+++ b/app/imports/client/ui/properties/viewers/AdjustmentViewer.vue
@@ -26,8 +26,8 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
-import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
+import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/AttributeViewer.vue b/app/imports/client/ui/properties/viewers/AttributeViewer.vue
similarity index 90%
rename from app/imports/ui/properties/viewers/AttributeViewer.vue
rename to app/imports/client/ui/properties/viewers/AttributeViewer.vue
index b36e5184..a4e339c7 100644
--- a/app/imports/ui/properties/viewers/AttributeViewer.vue
+++ b/app/imports/client/ui/properties/viewers/AttributeViewer.vue
@@ -127,14 +127,14 @@
 </template>
 
 <script lang="js">
-  import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-  import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-  import AttributeEffect from '/imports/ui/properties/components/attributes/AttributeEffect.vue';
+  import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
+  import numberToSignedString from '../../../../api/utility/numberToSignedString.js';
+  import AttributeEffect from '/imports/client/ui/properties/components/attributes/AttributeEffect.vue';
   import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
-  import IncrementButton from '/imports/ui/components/IncrementButton.vue';
-  import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
-  import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
-  import sortEffects from '/imports/ui/utility/sortEffects.js';
+  import IncrementButton from '/imports/client/ui/components/IncrementButton.vue';
+  import getProficiencyIcon from '/imports/client/ui/utility/getProficiencyIcon.js';
+  import {snackbar} from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+  import sortEffects from '/imports/client/ui/utility/sortEffects.js';
 
   export default {
     components: {
diff --git a/app/imports/ui/properties/viewers/BranchViewer.vue b/app/imports/client/ui/properties/viewers/BranchViewer.vue
similarity index 87%
rename from app/imports/ui/properties/viewers/BranchViewer.vue
rename to app/imports/client/ui/properties/viewers/BranchViewer.vue
index 8220c83a..4ce98e52 100644
--- a/app/imports/ui/properties/viewers/BranchViewer.vue
+++ b/app/imports/client/ui/properties/viewers/BranchViewer.vue
@@ -20,8 +20,8 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
+import numberToSignedString from '../../../../api/utility/numberToSignedString.js';
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/BuffRemoverViewer.vue b/app/imports/client/ui/properties/viewers/BuffRemoverViewer.vue
similarity index 92%
rename from app/imports/ui/properties/viewers/BuffRemoverViewer.vue
rename to app/imports/client/ui/properties/viewers/BuffRemoverViewer.vue
index 89097b7e..11512a20 100644
--- a/app/imports/ui/properties/viewers/BuffRemoverViewer.vue
+++ b/app/imports/client/ui/properties/viewers/BuffRemoverViewer.vue
@@ -54,8 +54,8 @@
 </template>
 
 <script lang="js">
-  import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-  import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+  import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
+  import numberToSignedString from '../../../../api/utility/numberToSignedString.js';
 
   export default {
     mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/BuffViewer.vue b/app/imports/client/ui/properties/viewers/BuffViewer.vue
similarity index 86%
rename from app/imports/ui/properties/viewers/BuffViewer.vue
rename to app/imports/client/ui/properties/viewers/BuffViewer.vue
index 214f33f2..08d72fe6 100644
--- a/app/imports/ui/properties/viewers/BuffViewer.vue
+++ b/app/imports/client/ui/properties/viewers/BuffViewer.vue
@@ -21,8 +21,8 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
+import numberToSignedString from '../../../../api/utility/numberToSignedString.js';
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/ClassLevelViewer.vue b/app/imports/client/ui/properties/viewers/ClassLevelViewer.vue
similarity index 88%
rename from app/imports/ui/properties/viewers/ClassLevelViewer.vue
rename to app/imports/client/ui/properties/viewers/ClassLevelViewer.vue
index e2464b62..b892d3aa 100644
--- a/app/imports/ui/properties/viewers/ClassLevelViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ClassLevelViewer.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/ClassViewer.vue b/app/imports/client/ui/properties/viewers/ClassViewer.vue
similarity index 96%
rename from app/imports/ui/properties/viewers/ClassViewer.vue
rename to app/imports/client/ui/properties/viewers/ClassViewer.vue
index a03d3431..2e485260 100644
--- a/app/imports/ui/properties/viewers/ClassViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ClassViewer.vue
@@ -73,7 +73,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
 import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
 
 export default {
diff --git a/app/imports/ui/properties/viewers/ConstantViewer.vue b/app/imports/client/ui/properties/viewers/ConstantViewer.vue
similarity index 79%
rename from app/imports/ui/properties/viewers/ConstantViewer.vue
rename to app/imports/client/ui/properties/viewers/ConstantViewer.vue
index 3b13b3ad..a635cbdd 100644
--- a/app/imports/ui/properties/viewers/ConstantViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ConstantViewer.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/ContainerViewer.vue b/app/imports/client/ui/properties/viewers/ContainerViewer.vue
similarity index 94%
rename from app/imports/ui/properties/viewers/ContainerViewer.vue
rename to app/imports/client/ui/properties/viewers/ContainerViewer.vue
index 0d2a7ab0..5b5bdc84 100644
--- a/app/imports/ui/properties/viewers/ContainerViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ContainerViewer.vue
@@ -100,8 +100,8 @@
 </template>
 
 <script lang="js">
-import CoinValue from '/imports/ui/components/CoinValue.vue';
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 export default {
   components: {
     CoinValue,
diff --git a/app/imports/ui/properties/viewers/DamageMultiplierViewer.vue b/app/imports/client/ui/properties/viewers/DamageMultiplierViewer.vue
similarity index 94%
rename from app/imports/ui/properties/viewers/DamageMultiplierViewer.vue
rename to app/imports/client/ui/properties/viewers/DamageMultiplierViewer.vue
index cde9cba9..f7cbd413 100644
--- a/app/imports/ui/properties/viewers/DamageMultiplierViewer.vue
+++ b/app/imports/client/ui/properties/viewers/DamageMultiplierViewer.vue
@@ -58,7 +58,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 export default {
   mixins: [propertyViewerMixin],
   computed: {
diff --git a/app/imports/ui/properties/viewers/DamageViewer.vue b/app/imports/client/ui/properties/viewers/DamageViewer.vue
similarity index 87%
rename from app/imports/ui/properties/viewers/DamageViewer.vue
rename to app/imports/client/ui/properties/viewers/DamageViewer.vue
index 8862e10c..af8f2829 100644
--- a/app/imports/ui/properties/viewers/DamageViewer.vue
+++ b/app/imports/client/ui/properties/viewers/DamageViewer.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/EffectViewer.vue b/app/imports/client/ui/properties/viewers/EffectViewer.vue
similarity index 95%
rename from app/imports/ui/properties/viewers/EffectViewer.vue
rename to app/imports/client/ui/properties/viewers/EffectViewer.vue
index 5880fc10..db389971 100644
--- a/app/imports/ui/properties/viewers/EffectViewer.vue
+++ b/app/imports/client/ui/properties/viewers/EffectViewer.vue
@@ -75,8 +75,8 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
-import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
+import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
 import { isFinite } from 'lodash';
 
 export default {
diff --git a/app/imports/ui/properties/viewers/FeatureViewer.vue b/app/imports/client/ui/properties/viewers/FeatureViewer.vue
similarity index 80%
rename from app/imports/ui/properties/viewers/FeatureViewer.vue
rename to app/imports/client/ui/properties/viewers/FeatureViewer.vue
index ae5c405b..746e1280 100644
--- a/app/imports/ui/properties/viewers/FeatureViewer.vue
+++ b/app/imports/client/ui/properties/viewers/FeatureViewer.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 export default {
   mixins: [propertyViewerMixin],
 }
diff --git a/app/imports/ui/properties/viewers/FolderViewer.vue b/app/imports/client/ui/properties/viewers/FolderViewer.vue
similarity index 64%
rename from app/imports/ui/properties/viewers/FolderViewer.vue
rename to app/imports/client/ui/properties/viewers/FolderViewer.vue
index 51a51a76..91e24a6d 100644
--- a/app/imports/ui/properties/viewers/FolderViewer.vue
+++ b/app/imports/client/ui/properties/viewers/FolderViewer.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 export default {
   mixins: [propertyViewerMixin],
 }
diff --git a/app/imports/ui/properties/viewers/ItemViewer.vue b/app/imports/client/ui/properties/viewers/ItemViewer.vue
similarity index 93%
rename from app/imports/ui/properties/viewers/ItemViewer.vue
rename to app/imports/client/ui/properties/viewers/ItemViewer.vue
index 0db65ce7..8f5b38fa 100644
--- a/app/imports/ui/properties/viewers/ItemViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ItemViewer.vue
@@ -136,12 +136,12 @@
 
 <script lang="js">
 import SVG_ICONS from '/imports/constants/SVG_ICONS.js';
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-import CoinValue from '/imports/ui/components/CoinValue.vue';
-import IncrementButton from '/imports/ui/components/IncrementButton.vue';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
+import IncrementButton from '/imports/client/ui/components/IncrementButton.vue';
 import adjustQuantity from '/imports/api/creature/creatureProperties/methods/adjustQuantity.js';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/NoteViewer.vue b/app/imports/client/ui/properties/viewers/NoteViewer.vue
similarity index 80%
rename from app/imports/ui/properties/viewers/NoteViewer.vue
rename to app/imports/client/ui/properties/viewers/NoteViewer.vue
index a5c8a27a..789bed8d 100644
--- a/app/imports/ui/properties/viewers/NoteViewer.vue
+++ b/app/imports/client/ui/properties/viewers/NoteViewer.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 export default {
   mixins: [propertyViewerMixin],
 }
diff --git a/app/imports/ui/properties/viewers/PointBuyViewer.vue b/app/imports/client/ui/properties/viewers/PointBuyViewer.vue
similarity index 91%
rename from app/imports/ui/properties/viewers/PointBuyViewer.vue
rename to app/imports/client/ui/properties/viewers/PointBuyViewer.vue
index 760b87ab..20ef8fe3 100644
--- a/app/imports/ui/properties/viewers/PointBuyViewer.vue
+++ b/app/imports/client/ui/properties/viewers/PointBuyViewer.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 import { timingOptions, eventOptions, actionPropertyTypeOptions } from '/imports/api/properties/Triggers.js';
 
diff --git a/app/imports/ui/properties/viewers/ProficiencyViewer.vue b/app/imports/client/ui/properties/viewers/ProficiencyViewer.vue
similarity index 83%
rename from app/imports/ui/properties/viewers/ProficiencyViewer.vue
rename to app/imports/client/ui/properties/viewers/ProficiencyViewer.vue
index 0ee43e14..54eed6fa 100644
--- a/app/imports/ui/properties/viewers/ProficiencyViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ProficiencyViewer.vue
@@ -24,8 +24,8 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
-import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
+import ProficiencyIcon from '/imports/client/ui/properties/shared/ProficiencyIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/ReferenceViewer.vue b/app/imports/client/ui/properties/viewers/ReferenceViewer.vue
similarity index 80%
rename from app/imports/ui/properties/viewers/ReferenceViewer.vue
rename to app/imports/client/ui/properties/viewers/ReferenceViewer.vue
index 3806984a..570ee0c0 100644
--- a/app/imports/ui/properties/viewers/ReferenceViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ReferenceViewer.vue
@@ -24,8 +24,8 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/RollViewer.vue b/app/imports/client/ui/properties/viewers/RollViewer.vue
similarity index 80%
rename from app/imports/ui/properties/viewers/RollViewer.vue
rename to app/imports/client/ui/properties/viewers/RollViewer.vue
index 31e87bbf..3a41e1ed 100644
--- a/app/imports/ui/properties/viewers/RollViewer.vue
+++ b/app/imports/client/ui/properties/viewers/RollViewer.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/SavingThrowViewer.vue b/app/imports/client/ui/properties/viewers/SavingThrowViewer.vue
similarity index 83%
rename from app/imports/ui/properties/viewers/SavingThrowViewer.vue
rename to app/imports/client/ui/properties/viewers/SavingThrowViewer.vue
index 59feea7a..973533ce 100644
--- a/app/imports/ui/properties/viewers/SavingThrowViewer.vue
+++ b/app/imports/client/ui/properties/viewers/SavingThrowViewer.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/SkillViewer.vue b/app/imports/client/ui/properties/viewers/SkillViewer.vue
similarity index 92%
rename from app/imports/ui/properties/viewers/SkillViewer.vue
rename to app/imports/client/ui/properties/viewers/SkillViewer.vue
index db6609c5..fdbf34cb 100644
--- a/app/imports/ui/properties/viewers/SkillViewer.vue
+++ b/app/imports/client/ui/properties/viewers/SkillViewer.vue
@@ -119,14 +119,14 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
+import numberToSignedString from '../../../../api/utility/numberToSignedString.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import AttributeEffect from '/imports/ui/properties/components/attributes/AttributeEffect.vue';
-import SkillProficiency from '/imports/ui/properties/components/skills/SkillProficiency.vue';
+import AttributeEffect from '/imports/client/ui/properties/components/attributes/AttributeEffect.vue';
+import SkillProficiency from '/imports/client/ui/properties/components/skills/SkillProficiency.vue';
 import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
-import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
-import sortEffects from '/imports/ui/utility/sortEffects.js';
+import getProficiencyIcon from '/imports/client/ui/utility/getProficiencyIcon.js';
+import sortEffects from '/imports/client/ui/utility/sortEffects.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/SlotFillerViewer.vue b/app/imports/client/ui/properties/viewers/SlotFillerViewer.vue
similarity index 87%
rename from app/imports/ui/properties/viewers/SlotFillerViewer.vue
rename to app/imports/client/ui/properties/viewers/SlotFillerViewer.vue
index d3cb60c5..fc53aec7 100644
--- a/app/imports/ui/properties/viewers/SlotFillerViewer.vue
+++ b/app/imports/client/ui/properties/viewers/SlotFillerViewer.vue
@@ -39,9 +39,9 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/SlotViewer.vue b/app/imports/client/ui/properties/viewers/SlotViewer.vue
similarity index 92%
rename from app/imports/ui/properties/viewers/SlotViewer.vue
rename to app/imports/client/ui/properties/viewers/SlotViewer.vue
index 55ceeb8d..53b82f50 100644
--- a/app/imports/ui/properties/viewers/SlotViewer.vue
+++ b/app/imports/client/ui/properties/viewers/SlotViewer.vue
@@ -60,9 +60,9 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import FillSlotButton from '/imports/ui/creature/buildTree/FillSlotButton.vue';
+import FillSlotButton from '/imports/client/ui/creature/buildTree/FillSlotButton.vue';
 
 const uniqueText = {
   uniqueInSlot: 'Each property inside this slot should be unique',
diff --git a/app/imports/ui/properties/viewers/SpellListViewer.vue b/app/imports/client/ui/properties/viewers/SpellListViewer.vue
similarity index 91%
rename from app/imports/ui/properties/viewers/SpellListViewer.vue
rename to app/imports/client/ui/properties/viewers/SpellListViewer.vue
index 6aae147e..0040f82e 100644
--- a/app/imports/ui/properties/viewers/SpellListViewer.vue
+++ b/app/imports/client/ui/properties/viewers/SpellListViewer.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 export default {
   mixins: [propertyViewerMixin],
 }
diff --git a/app/imports/ui/properties/viewers/SpellViewer.vue b/app/imports/client/ui/properties/viewers/SpellViewer.vue
similarity index 93%
rename from app/imports/ui/properties/viewers/SpellViewer.vue
rename to app/imports/client/ui/properties/viewers/SpellViewer.vue
index ee8085b2..8058e754 100644
--- a/app/imports/ui/properties/viewers/SpellViewer.vue
+++ b/app/imports/client/ui/properties/viewers/SpellViewer.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
 import ActionViewer from './ActionViewer.vue';
 
 const levelText = [
diff --git a/app/imports/ui/properties/viewers/ToggleViewer.vue b/app/imports/client/ui/properties/viewers/ToggleViewer.vue
similarity index 85%
rename from app/imports/ui/properties/viewers/ToggleViewer.vue
rename to app/imports/client/ui/properties/viewers/ToggleViewer.vue
index f2b9037a..6f4ce02d 100644
--- a/app/imports/ui/properties/viewers/ToggleViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ToggleViewer.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/TriggerViewer.vue b/app/imports/client/ui/properties/viewers/TriggerViewer.vue
similarity index 94%
rename from app/imports/ui/properties/viewers/TriggerViewer.vue
rename to app/imports/client/ui/properties/viewers/TriggerViewer.vue
index ce7e1f44..71dcdc3b 100644
--- a/app/imports/ui/properties/viewers/TriggerViewer.vue
+++ b/app/imports/client/ui/properties/viewers/TriggerViewer.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 import { timingOptions, eventOptions, actionPropertyTypeOptions } from '/imports/api/properties/Triggers.js';
 
diff --git a/app/imports/ui/properties/viewers/shared/PropertyDescription.vue b/app/imports/client/ui/properties/viewers/shared/PropertyDescription.vue
similarity index 85%
rename from app/imports/ui/properties/viewers/shared/PropertyDescription.vue
rename to app/imports/client/ui/properties/viewers/shared/PropertyDescription.vue
index 884bbdd8..67701bf1 100644
--- a/app/imports/ui/properties/viewers/shared/PropertyDescription.vue
+++ b/app/imports/client/ui/properties/viewers/shared/PropertyDescription.vue
@@ -13,8 +13,8 @@
 </template>
 
 <script lang="js">
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
-import PropertyField from '/imports/ui/properties/viewers/shared/PropertyField.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
+import PropertyField from '/imports/client/ui/properties/viewers/shared/PropertyField.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/shared/PropertyField.vue b/app/imports/client/ui/properties/viewers/shared/PropertyField.vue
similarity index 96%
rename from app/imports/ui/properties/viewers/shared/PropertyField.vue
rename to app/imports/client/ui/properties/viewers/shared/PropertyField.vue
index b37685d7..f72a91a5 100644
--- a/app/imports/ui/properties/viewers/shared/PropertyField.vue
+++ b/app/imports/client/ui/properties/viewers/shared/PropertyField.vue
@@ -77,8 +77,8 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import InlineEffect from '/imports/ui/properties/components/effects/InlineEffect.vue';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
+import InlineEffect from '/imports/client/ui/properties/components/effects/InlineEffect.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/shared/PropertyName.vue b/app/imports/client/ui/properties/viewers/shared/PropertyName.vue
similarity index 100%
rename from app/imports/ui/properties/viewers/shared/PropertyName.vue
rename to app/imports/client/ui/properties/viewers/shared/PropertyName.vue
diff --git a/app/imports/ui/properties/viewers/shared/PropertyTags.vue b/app/imports/client/ui/properties/viewers/shared/PropertyTags.vue
similarity index 100%
rename from app/imports/ui/properties/viewers/shared/PropertyTags.vue
rename to app/imports/client/ui/properties/viewers/shared/PropertyTags.vue
diff --git a/app/imports/ui/properties/viewers/shared/PropertyVariableName.vue b/app/imports/client/ui/properties/viewers/shared/PropertyVariableName.vue
similarity index 100%
rename from app/imports/ui/properties/viewers/shared/PropertyVariableName.vue
rename to app/imports/client/ui/properties/viewers/shared/PropertyVariableName.vue
diff --git a/app/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js b/app/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js
new file mode 100644
index 00000000..456bdbf5
--- /dev/null
+++ b/app/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js
@@ -0,0 +1,61 @@
+import ActionViewer from '/imports/client/ui/properties/viewers/ActionViewer.vue';
+import AdjustmentViewer from '/imports/client/ui/properties/viewers/AdjustmentViewer.vue';
+import AttributeViewer from '/imports/client/ui/properties/viewers/AttributeViewer.vue';
+import BuffViewer from '/imports/client/ui/properties/viewers/BuffViewer.vue';
+import BuffRemoverViewer from '/imports/client/ui/properties/viewers/BuffRemoverViewer.vue';
+import BranchViewer from '/imports/client/ui/properties/viewers/BranchViewer.vue';
+import ContainerViewer from '/imports/client/ui/properties/viewers/ContainerViewer.vue';
+import ClassViewer from '/imports/client/ui/properties/viewers/ClassViewer.vue';
+import ClassLevelViewer from '/imports/client/ui/properties/viewers/ClassLevelViewer.vue';
+import ConstantViewer from '/imports/client/ui/properties/viewers/ConstantViewer.vue';
+import DamageViewer from '/imports/client/ui/properties/viewers/DamageViewer.vue';
+import DamageMultiplierViewer from '/imports/client/ui/properties/viewers/DamageMultiplierViewer.vue';
+import EffectViewer from '/imports/client/ui/properties/viewers/EffectViewer.vue';
+import FeatureViewer from '/imports/client/ui/properties/viewers/FeatureViewer.vue';
+import FolderViewer from '/imports/client/ui/properties/viewers/FolderViewer.vue';
+import ItemViewer from '/imports/client/ui/properties/viewers/ItemViewer.vue';
+import NoteViewer from '/imports/client/ui/properties/viewers/NoteViewer.vue';
+import PointBuyViewer from '/imports/client/ui/properties/viewers/PointBuyViewer.vue';
+import ProficiencyViewer from '/imports/client/ui/properties/viewers/ProficiencyViewer.vue';
+import ReferenceViewer from '/imports/client/ui/properties/viewers/ReferenceViewer.vue';
+import RollViewer from '/imports/client/ui/properties/viewers/RollViewer.vue';
+import SkillViewer from '/imports/client/ui/properties/viewers/SkillViewer.vue';
+import SavingThrowViewer from '/imports/client/ui/properties/viewers/SavingThrowViewer.vue';
+import SlotViewer from '/imports/client/ui/properties/viewers/SlotViewer.vue';
+import SlotFillerViewer from '/imports/client/ui/properties/viewers/SlotFillerViewer.vue';
+import SpellListViewer from '/imports/client/ui/properties/viewers/SpellListViewer.vue';
+import SpellViewer from '/imports/client/ui/properties/viewers/SpellViewer.vue';
+import ToggleViewer from '/imports/client/ui/properties/viewers/ToggleViewer.vue';
+import TriggerViewer from '/imports/client/ui/properties/viewers/TriggerViewer.vue';
+
+export default {
+  action: ActionViewer,
+  adjustment: AdjustmentViewer,
+  attribute: AttributeViewer,
+  buff: BuffViewer,
+  buffRemover: BuffRemoverViewer,
+  branch: BranchViewer,
+  container: ContainerViewer,
+  class: ClassViewer,
+  classLevel: ClassLevelViewer,
+  constant: ConstantViewer,
+  damage: DamageViewer,
+  damageMultiplier: DamageMultiplierViewer,
+  effect: EffectViewer,
+  feature: FeatureViewer,
+  folder: FolderViewer,
+  item: ItemViewer,
+  note: NoteViewer,
+  pointBuy: PointBuyViewer,
+  proficiency: ProficiencyViewer,
+  propertySlot: SlotViewer,
+  roll: RollViewer,
+  reference: ReferenceViewer,
+  savingThrow: SavingThrowViewer,
+  slotFiller: SlotFillerViewer,
+  skill: SkillViewer,
+  spellList: SpellListViewer,
+  spell: SpellViewer,
+  toggle: ToggleViewer,
+  trigger: TriggerViewer,
+};
diff --git a/app/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js b/app/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js
new file mode 100644
index 00000000..4bec5f4e
--- /dev/null
+++ b/app/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js
@@ -0,0 +1,23 @@
+import PropertyName from '/imports/client/ui/properties/viewers/shared/PropertyName.vue';
+import PropertyVariableName from '/imports/client/ui/properties/viewers/shared/PropertyVariableName.vue';
+import PropertyField from '/imports/client/ui/properties/viewers/shared/PropertyField.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
+import PropertyTags from '/imports/client/ui/properties/viewers/shared/PropertyTags.vue';
+
+const propertyViewerMixin = {
+  components: {
+    PropertyName,
+    PropertyVariableName,
+    PropertyField,
+    PropertyDescription,
+    PropertyTags,
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+};
+
+export default propertyViewerMixin;
diff --git a/app/imports/ui/router.js b/app/imports/client/ui/router.js
similarity index 71%
rename from app/imports/ui/router.js
rename to app/imports/client/ui/router.js
index bb8dc307..a822afe1 100644
--- a/app/imports/ui/router.js
+++ b/app/imports/client/ui/router.js
@@ -2,44 +2,44 @@ import { RouterFactory, nativeScrollBehavior } from 'meteor/akryum:vue-router2';
 import { acceptInviteToken } from '/imports/api/users/Invites.js';
 import MAINTENANCE_MODE from '/imports/constants/MAINTENANCE_MODE.js';
 // Components
-const Home = () => import('/imports/ui/pages/Home.vue');
-const About = () => import('/imports/ui/pages/About.vue');
-const CharacterList = () => import('/imports/ui/pages/CharacterList.vue');
-const CharacterListToolbarItems = () => import('/imports/ui/creature/creatureList/CharacterListToolbarItems.vue');
-const Library = () => import('/imports/ui/pages/Library.vue');
-const LibraryCollection = () => import('/imports/ui/pages/LibraryCollection.vue');
-const LibraryCollectionToolbar = () => import('/imports/ui/library/LibraryCollectionToolbar.vue');
-const CharacterSheetPage = () => import('/imports/ui/pages/CharacterSheetPage.vue');
-const CharacterSheetToolbar = () => import('/imports/ui/creature/character/CharacterSheetToolbar.vue');
-const CharacterSheetRightDrawer = () => import('/imports/ui/creature/character/CharacterSheetRightDrawer.vue');
-const CharacterSheetPrinted = () => import('/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue');
-const SignIn = () => import('/imports/ui/pages/SignIn.vue');
-const Register = () => import('/imports/ui/pages/Register.vue');
-const IconAdmin = () => import('/imports/ui/icons/IconAdmin.vue');
-//const Friends = () => import('/imports/ui/pages/Friends.vue' );
-const Feedback = () => import('/imports/ui/pages/Feedback.vue');
-const FunctionReference = () => import('/imports/ui/pages/FunctionReference.vue');
-const Account = () => import('/imports/ui/pages/Account.vue');
-const InviteSuccess = () => import('/imports/ui/pages/InviteSuccess.vue');
-const InviteError = () => import('/imports/ui/pages/InviteError.vue');
-const EmailVerificationSuccess = () => import('/imports/ui/pages/EmailVerificationSuccess.vue');
-const EmailVerificationError = () => import('/imports/ui/pages/EmailVerificationError.vue');
-const ResetPassword = () => import('/imports/ui/pages/ResetPassword.vue');
-const NotImplemented = () => import('/imports/ui/pages/NotImplemented.vue');
-const PatreonLevelTooLow = () => import('/imports/ui/pages/PatreonLevelTooLow.vue');
-const SingleLibrary = () => import('/imports/ui/pages/SingleLibrary.vue');
-const SingleLibraryToolbar = () => import('/imports/ui/library/SingleLibraryToolbar.vue');
-const Tabletops = () => import('/imports/ui/pages/Tabletops.vue');
-const Tabletop = () => import('/imports/ui/pages/Tabletop.vue');
-const TabletopToolbar = () => import('/imports/ui/tabletop/TabletopToolbar.vue');
-const TabletopRightDrawer = () => import('/imports/ui/tabletop/TabletopRightDrawer.vue');
-const Admin = () => import('/imports/ui/pages/Admin.vue');
-const Maintenance = () => import('/imports/ui/pages/Maintenance.vue');
-const Files = () => import('/imports/ui/pages/Files.vue');
-const Documentation = () => import('/imports/ui/pages/Documentation.vue');
+const Home = () => import('/imports/client/ui/pages/Home.vue');
+const About = () => import('/imports/client/ui/pages/About.vue');
+const CharacterList = () => import('/imports/client/ui/pages/CharacterList.vue');
+const CharacterListToolbarItems = () => import('/imports/client/ui/creature/creatureList/CharacterListToolbarItems.vue');
+const Library = () => import('/imports/client/ui/pages/Library.vue');
+const LibraryCollection = () => import('/imports/client/ui/pages/LibraryCollection.vue');
+const LibraryCollectionToolbar = () => import('/imports/client/ui/library/LibraryCollectionToolbar.vue');
+const CharacterSheetPage = () => import('/imports/client/ui/pages/CharacterSheetPage.vue');
+const CharacterSheetToolbar = () => import('/imports/client/ui/creature/character/CharacterSheetToolbar.vue');
+const CharacterSheetRightDrawer = () => import('/imports/client/ui/creature/character/CharacterSheetRightDrawer.vue');
+const CharacterSheetPrinted = () => import('/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue');
+const SignIn = () => import('/imports/client/ui/pages/SignIn.vue');
+const Register = () => import('/imports/client/ui/pages/Register.vue');
+const IconAdmin = () => import('/imports/client/ui/icons/IconAdmin.vue');
+//const Friends = () => import('/imports/client/ui/pages/Friends.vue' );
+const Feedback = () => import('/imports/client/ui/pages/Feedback.vue');
+const FunctionReference = () => import('/imports/client/ui/pages/FunctionReference.vue');
+const Account = () => import('/imports/client/ui/pages/Account.vue');
+const InviteSuccess = () => import('/imports/client/ui/pages/InviteSuccess.vue');
+const InviteError = () => import('/imports/client/ui/pages/InviteError.vue');
+const EmailVerificationSuccess = () => import('/imports/client/ui/pages/EmailVerificationSuccess.vue');
+const EmailVerificationError = () => import('/imports/client/ui/pages/EmailVerificationError.vue');
+const ResetPassword = () => import('/imports/client/ui/pages/ResetPassword.vue');
+const NotImplemented = () => import('/imports/client/ui/pages/NotImplemented.vue');
+const PatreonLevelTooLow = () => import('/imports/client/ui/pages/PatreonLevelTooLow.vue');
+const SingleLibrary = () => import('/imports/client/ui/pages/SingleLibrary.vue');
+const SingleLibraryToolbar = () => import('/imports/client/ui/library/SingleLibraryToolbar.vue');
+const Tabletops = () => import('/imports/client/ui/pages/Tabletops.vue');
+const Tabletop = () => import('/imports/client/ui/pages/Tabletop.vue');
+const TabletopToolbar = () => import('/imports/client/ui/tabletop/TabletopToolbar.vue');
+const TabletopRightDrawer = () => import('/imports/client/ui/tabletop/TabletopRightDrawer.vue');
+const Admin = () => import('/imports/client/ui/pages/Admin.vue');
+const Maintenance = () => import('/imports/client/ui/pages/Maintenance.vue');
+const Files = () => import('/imports/client/ui/pages/Files.vue');
+const Documentation = () => import('/imports/client/ui/pages/Documentation.vue');
 
 // Not found
-const NotFound = () => import('/imports/ui/pages/NotFound.vue');
+const NotFound = () => import('/imports/client/ui/pages/NotFound.vue');
 
 let userSubscription = Meteor.subscribe('user');
 
diff --git a/app/imports/ui/sharing/ShareDialog.vue b/app/imports/client/ui/sharing/ShareDialog.vue
similarity index 99%
rename from app/imports/ui/sharing/ShareDialog.vue
rename to app/imports/client/ui/sharing/ShareDialog.vue
index 27d8318f..7db4aa24 100644
--- a/app/imports/ui/sharing/ShareDialog.vue
+++ b/app/imports/client/ui/sharing/ShareDialog.vue
@@ -141,7 +141,7 @@ import {
   updateUserSharePermissions
 } from '/imports/api/sharing/sharing.js';
 import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/sharing/TransferOwnershipDialog.vue b/app/imports/client/ui/sharing/TransferOwnershipDialog.vue
similarity index 95%
rename from app/imports/ui/sharing/TransferOwnershipDialog.vue
rename to app/imports/client/ui/sharing/TransferOwnershipDialog.vue
index aa8f35f0..425ef1b3 100644
--- a/app/imports/ui/sharing/TransferOwnershipDialog.vue
+++ b/app/imports/client/ui/sharing/TransferOwnershipDialog.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import { transferOwnership } from '/imports/api/sharing/sharing.js';
 
 export default {
diff --git a/app/imports/ui/styles/cardColors.css b/app/imports/client/ui/styles/cardColors.css
similarity index 100%
rename from app/imports/ui/styles/cardColors.css
rename to app/imports/client/ui/styles/cardColors.css
diff --git a/app/imports/ui/styles/cardTitles.css b/app/imports/client/ui/styles/cardTitles.css
similarity index 100%
rename from app/imports/ui/styles/cardTitles.css
rename to app/imports/client/ui/styles/cardTitles.css
diff --git a/app/imports/ui/styles/centeredInputs.css b/app/imports/client/ui/styles/centeredInputs.css
similarity index 100%
rename from app/imports/ui/styles/centeredInputs.css
rename to app/imports/client/ui/styles/centeredInputs.css
diff --git a/app/imports/ui/styles/denseLists.css b/app/imports/client/ui/styles/denseLists.css
similarity index 100%
rename from app/imports/ui/styles/denseLists.css
rename to app/imports/client/ui/styles/denseLists.css
diff --git a/app/imports/ui/styles/fitAvatars.css b/app/imports/client/ui/styles/fitAvatars.css
similarity index 100%
rename from app/imports/ui/styles/fitAvatars.css
rename to app/imports/client/ui/styles/fitAvatars.css
diff --git a/app/imports/ui/styles/inheritBackgrounds.css b/app/imports/client/ui/styles/inheritBackgrounds.css
similarity index 100%
rename from app/imports/ui/styles/inheritBackgrounds.css
rename to app/imports/client/ui/styles/inheritBackgrounds.css
diff --git a/app/imports/ui/styles/largeFormatInputs.css b/app/imports/client/ui/styles/largeFormatInputs.css
similarity index 100%
rename from app/imports/ui/styles/largeFormatInputs.css
rename to app/imports/client/ui/styles/largeFormatInputs.css
diff --git a/app/imports/ui/styles/lineClamp.css b/app/imports/client/ui/styles/lineClamp.css
similarity index 100%
rename from app/imports/ui/styles/lineClamp.css
rename to app/imports/client/ui/styles/lineClamp.css
diff --git a/app/imports/ui/styles/markdown.css b/app/imports/client/ui/styles/markdown.css
similarity index 100%
rename from app/imports/ui/styles/markdown.css
rename to app/imports/client/ui/styles/markdown.css
diff --git a/app/imports/ui/styles/speedDial.css b/app/imports/client/ui/styles/speedDial.css
similarity index 100%
rename from app/imports/ui/styles/speedDial.css
rename to app/imports/client/ui/styles/speedDial.css
diff --git a/app/imports/ui/styles/stylesIndex.js b/app/imports/client/ui/styles/stylesIndex.js
similarity index 100%
rename from app/imports/ui/styles/stylesIndex.js
rename to app/imports/client/ui/styles/stylesIndex.js
diff --git a/app/imports/ui/styles/toolbarFlex.css b/app/imports/client/ui/styles/toolbarFlex.css
similarity index 100%
rename from app/imports/ui/styles/toolbarFlex.css
rename to app/imports/client/ui/styles/toolbarFlex.css
diff --git a/app/imports/ui/tabletop/SelectCreaturesDialog.vue b/app/imports/client/ui/tabletop/SelectCreaturesDialog.vue
similarity index 89%
rename from app/imports/ui/tabletop/SelectCreaturesDialog.vue
rename to app/imports/client/ui/tabletop/SelectCreaturesDialog.vue
index 939b0d27..daf886e7 100644
--- a/app/imports/ui/tabletop/SelectCreaturesDialog.vue
+++ b/app/imports/client/ui/tabletop/SelectCreaturesDialog.vue
@@ -30,9 +30,9 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import CreatureListTile from '/imports/ui/creature/creatureList/CreatureListTile.vue';
+import CreatureListTile from '/imports/client/ui/creature/creatureList/CreatureListTile.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/tabletop/TabletopActionCards.vue b/app/imports/client/ui/tabletop/TabletopActionCards.vue
similarity index 91%
rename from app/imports/ui/tabletop/TabletopActionCards.vue
rename to app/imports/client/ui/tabletop/TabletopActionCards.vue
index 2e732f15..bd488f40 100644
--- a/app/imports/ui/tabletop/TabletopActionCards.vue
+++ b/app/imports/client/ui/tabletop/TabletopActionCards.vue
@@ -10,7 +10,7 @@
 
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import ActionCard from '/imports/ui/properties/components/actions/ActionCard.vue';
+import ActionCard from '/imports/client/ui/properties/components/actions/ActionCard.vue';
 
 function getProperties(ancestorId, type){
   if (!ancestorId) return [];
diff --git a/app/imports/ui/tabletop/TabletopComponent.vue b/app/imports/client/ui/tabletop/TabletopComponent.vue
similarity index 84%
rename from app/imports/ui/tabletop/TabletopComponent.vue
rename to app/imports/client/ui/tabletop/TabletopComponent.vue
index ee3b8a58..2e602706 100644
--- a/app/imports/ui/tabletop/TabletopComponent.vue
+++ b/app/imports/client/ui/tabletop/TabletopComponent.vue
@@ -38,12 +38,12 @@
 
 <script lang="js">
 import addCreaturesToTabletop from '/imports/api/tabletop/methods/addCreaturesToTabletop.js';
-import TabletopCreatureCard from '/imports/ui/tabletop/TabletopCreatureCard.vue';
-import TabletopMap from '/imports/ui/tabletop/TabletopMap.vue';
+import TabletopCreatureCard from '/imports/client/ui/tabletop/TabletopCreatureCard.vue';
+import TabletopMap from '/imports/client/ui/tabletop/TabletopMap.vue';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import TabletopActionCards from '/imports/ui/tabletop/TabletopActionCards.vue';
-import MiniCharacterSheet from '/imports/ui/creature/character/MiniCharacterSheet.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import TabletopActionCards from '/imports/client/ui/tabletop/TabletopActionCards.vue';
+import MiniCharacterSheet from '/imports/client/ui/creature/character/MiniCharacterSheet.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/tabletop/TabletopCreatureCard.vue b/app/imports/client/ui/tabletop/TabletopCreatureCard.vue
similarity index 100%
rename from app/imports/ui/tabletop/TabletopCreatureCard.vue
rename to app/imports/client/ui/tabletop/TabletopCreatureCard.vue
diff --git a/app/imports/ui/tabletop/TabletopLog.vue b/app/imports/client/ui/tabletop/TabletopLog.vue
similarity index 100%
rename from app/imports/ui/tabletop/TabletopLog.vue
rename to app/imports/client/ui/tabletop/TabletopLog.vue
diff --git a/app/imports/ui/tabletop/TabletopMap.vue b/app/imports/client/ui/tabletop/TabletopMap.vue
similarity index 100%
rename from app/imports/ui/tabletop/TabletopMap.vue
rename to app/imports/client/ui/tabletop/TabletopMap.vue
diff --git a/app/imports/ui/tabletop/TabletopRightDrawer.vue b/app/imports/client/ui/tabletop/TabletopRightDrawer.vue
similarity index 87%
rename from app/imports/ui/tabletop/TabletopRightDrawer.vue
rename to app/imports/client/ui/tabletop/TabletopRightDrawer.vue
index 9d5fc55f..4a82217d 100644
--- a/app/imports/ui/tabletop/TabletopRightDrawer.vue
+++ b/app/imports/client/ui/tabletop/TabletopRightDrawer.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script lang="js">
-import TabletopLog from '/imports/ui/tabletop/TabletopLog.vue';
+import TabletopLog from '/imports/client/ui/tabletop/TabletopLog.vue';
 export default {
   components: {
     TabletopLog,
diff --git a/app/imports/ui/tabletop/TabletopToolbar.vue b/app/imports/client/ui/tabletop/TabletopToolbar.vue
similarity index 100%
rename from app/imports/ui/tabletop/TabletopToolbar.vue
rename to app/imports/client/ui/tabletop/TabletopToolbar.vue
diff --git a/app/imports/ui/themes.js b/app/imports/client/ui/themes.js
similarity index 100%
rename from app/imports/ui/themes.js
rename to app/imports/client/ui/themes.js
diff --git a/app/imports/ui/user/DeleteUserAccountDialog.vue b/app/imports/client/ui/user/DeleteUserAccountDialog.vue
similarity index 95%
rename from app/imports/ui/user/DeleteUserAccountDialog.vue
rename to app/imports/client/ui/user/DeleteUserAccountDialog.vue
index a5a2d5ac..45dc28b7 100644
--- a/app/imports/ui/user/DeleteUserAccountDialog.vue
+++ b/app/imports/client/ui/user/DeleteUserAccountDialog.vue
@@ -89,10 +89,10 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import Libraries from '/imports/api/library/Libraries.js';
-import CreatureListTile from '/imports/ui/creature/creatureList/CreatureListTile.vue';
+import CreatureListTile from '/imports/client/ui/creature/creatureList/CreatureListTile.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/user/InviteDialog.vue b/app/imports/client/ui/user/InviteDialog.vue
similarity index 96%
rename from app/imports/ui/user/InviteDialog.vue
rename to app/imports/client/ui/user/InviteDialog.vue
index c633025c..7230d6dd 100644
--- a/app/imports/ui/user/InviteDialog.vue
+++ b/app/imports/client/ui/user/InviteDialog.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Invites, { getInviteToken, revokeInvite } from '/imports/api/users/Invites.js';
 
 export default {
diff --git a/app/imports/ui/user/TierTooLowDialog.vue b/app/imports/client/ui/user/TierTooLowDialog.vue
similarity index 96%
rename from app/imports/ui/user/TierTooLowDialog.vue
rename to app/imports/client/ui/user/TierTooLowDialog.vue
index bd6eeb9a..3f28175e 100644
--- a/app/imports/ui/user/TierTooLowDialog.vue
+++ b/app/imports/client/ui/user/TierTooLowDialog.vue
@@ -47,7 +47,7 @@
 
 <script lang="js">
 import TIERS, { getUserTier } from '/imports/api/users/patreon/tiers.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import linkWithPatreon from '/imports/api/users/methods/linkWithPatreon.js'
 
 export default {
diff --git a/app/imports/ui/user/UsernameDialog.vue b/app/imports/client/ui/user/UsernameDialog.vue
similarity index 95%
rename from app/imports/ui/user/UsernameDialog.vue
rename to app/imports/client/ui/user/UsernameDialog.vue
index 8980d6bc..f565c9e5 100644
--- a/app/imports/ui/user/UsernameDialog.vue
+++ b/app/imports/client/ui/user/UsernameDialog.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/utility/escapeRegex.js b/app/imports/client/ui/utility/escapeRegex.js
similarity index 100%
rename from app/imports/ui/utility/escapeRegex.js
rename to app/imports/client/ui/utility/escapeRegex.js
diff --git a/app/imports/ui/utility/getEffectIcon.js b/app/imports/client/ui/utility/getEffectIcon.js
similarity index 100%
rename from app/imports/ui/utility/getEffectIcon.js
rename to app/imports/client/ui/utility/getEffectIcon.js
diff --git a/app/imports/ui/utility/getProficiencyIcon.js b/app/imports/client/ui/utility/getProficiencyIcon.js
similarity index 100%
rename from app/imports/ui/utility/getProficiencyIcon.js
rename to app/imports/client/ui/utility/getProficiencyIcon.js
diff --git a/app/imports/ui/utility/getThemeColor.js b/app/imports/client/ui/utility/getThemeColor.js
similarity index 76%
rename from app/imports/ui/utility/getThemeColor.js
rename to app/imports/client/ui/utility/getThemeColor.js
index f53596f9..ce818e63 100644
--- a/app/imports/ui/utility/getThemeColor.js
+++ b/app/imports/client/ui/utility/getThemeColor.js
@@ -1,4 +1,4 @@
-import vuetify from '/imports/ui/vuetify.js';
+import vuetify from '/imports/client/ui/vuetify.js';
 
 export default function(color){
   return vuetify.framework.theme.dark ?
diff --git a/app/imports/ui/utility/isDarkColor.js b/app/imports/client/ui/utility/isDarkColor.js
similarity index 100%
rename from app/imports/ui/utility/isDarkColor.js
rename to app/imports/client/ui/utility/isDarkColor.js
diff --git a/app/imports/ui/utility/sortEffects.js b/app/imports/client/ui/utility/sortEffects.js
similarity index 100%
rename from app/imports/ui/utility/sortEffects.js
rename to app/imports/client/ui/utility/sortEffects.js
diff --git a/app/imports/ui/utility/swapCase.js b/app/imports/client/ui/utility/swapCase.js
similarity index 100%
rename from app/imports/ui/utility/swapCase.js
rename to app/imports/client/ui/utility/swapCase.js
diff --git a/app/imports/ui/utility/valueToCoins.js b/app/imports/client/ui/utility/valueToCoins.js
similarity index 100%
rename from app/imports/ui/utility/valueToCoins.js
rename to app/imports/client/ui/utility/valueToCoins.js
diff --git a/app/imports/ui/vueSetup.js b/app/imports/client/ui/vueSetup.js
similarity index 61%
rename from app/imports/ui/vueSetup.js
rename to app/imports/client/ui/vueSetup.js
index 6b6fb590..a0d32007 100644
--- a/app/imports/ui/vueSetup.js
+++ b/app/imports/client/ui/vueSetup.js
@@ -1,13 +1,13 @@
 import Vue from 'vue';
-import store from '/imports/ui/vuexStore.js';
+import store from '/imports/client/ui/vuexStore.js';
 import VueMeteorTracker from 'vue-meteor-tracker';
-import AppLayout from '/imports/ui/layouts/AppLayout.vue';
+import AppLayout from '/imports/client/ui/layouts/AppLayout.vue';
 import ReactiveProvide from 'vue-reactive-provide';
 import VueObserverUtils from '@tozd/vue-observer-utils';
-import router from '/imports/ui/router.js';
-import '/imports/ui/components/global/globalIndex.js';
-import '/imports/ui/markdownCofig.js';
-import vuetify from '/imports/ui/vuetify.js';
+import router from '/imports/client/ui/router.js';
+import '/imports/client/ui/components/global/globalIndex.js';
+import '/imports/client/ui/markdownCofig.js';
+import vuetify from '/imports/client/ui/vuetify.js';
 
 Vue.use(VueMeteorTracker);
 Vue.config.meteor.freeze = true;
diff --git a/app/imports/ui/vuetify.js b/app/imports/client/ui/vuetify.js
similarity index 86%
rename from app/imports/ui/vuetify.js
rename to app/imports/client/ui/vuetify.js
index 34acac19..f4d31024 100644
--- a/app/imports/ui/vuetify.js
+++ b/app/imports/client/ui/vuetify.js
@@ -3,8 +3,8 @@ import Vue from 'vue';
 import Vuetify from 'vuetify/lib/framework';
 import { Scroll, Ripple } from 'vuetify/lib/directives';
 import SVG_ICONS from '/imports/constants/SVG_ICONS.js';
-import SvgIconByName from '/imports/ui/icons/SvgIconByName.vue';
-import themes from '/imports/ui/themes.js';
+import SvgIconByName from '/imports/client/ui/icons/SvgIconByName.vue';
+import themes from '/imports/client/ui/themes.js';
 import minifyTheme from 'minify-css-string';
 
 Vue.use(Vuetify, {
diff --git a/app/imports/ui/vuexStore.js b/app/imports/client/ui/vuexStore.js
similarity index 95%
rename from app/imports/ui/vuexStore.js
rename to app/imports/client/ui/vuexStore.js
index 173e276b..4c301190 100644
--- a/app/imports/ui/vuexStore.js
+++ b/app/imports/client/ui/vuexStore.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
-import dialogStackStore from '/imports/ui/dialogStack/dialogStackStore.js';
+import dialogStackStore from '/imports/client/ui/dialogStack/dialogStackStore.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 const tabs = ['stats', 'features', 'inventory', 'spells', 'journal', 'build', 'tree'];
 const tabsWithoutSpells = ['stats', 'features', 'inventory', 'journal', 'build', 'tree'];
diff --git a/app/imports/ui/components/global/globalIndex.js b/app/imports/ui/components/global/globalIndex.js
deleted file mode 100644
index 84c28bbe..00000000
--- a/app/imports/ui/components/global/globalIndex.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Vue from 'vue';
-// Global components
-import DatePicker from '/imports/ui/components/global/DatePicker.vue';
-import IconPicker from '/imports/ui/components/global/IconPicker.vue';
-import TextField from '/imports/ui/components/global/TextField.vue';
-import TextArea from '/imports/ui/components/global/TextArea.vue';
-import SmartSelect from '/imports/ui/components/global/SmartSelect.vue';
-import SmartBtn from '/imports/ui/components/global/SmartBtn.vue';
-import SmartCombobox from '/imports/ui/components/global/SmartCombobox.vue';
-import SmartCheckbox from '/imports/ui/components/global/SmartCheckbox.vue';
-import SmartSwitch from '/imports/ui/components/global/SmartSwitch.vue';
-import SvgIcon from '/imports/ui/components/global/SvgIcon.vue';
-import SmartSlider from '/imports/ui/components/global/SmartSlider.vue';
-
-Vue.component('DatePicker', DatePicker);
-Vue.component('IconPicker', IconPicker);
-Vue.component('TextField', TextField);
-Vue.component('TextArea', TextArea);
-Vue.component('SmartSelect', SmartSelect);
-Vue.component('SmartBtn', SmartBtn);
-Vue.component('SmartCombobox', SmartCombobox);
-Vue.component('SmartCheckbox', SmartCheckbox);
-Vue.component('SmartSlider', SmartSlider);
-Vue.component('SmartSwitch', SmartSwitch);
-Vue.component('SvgIcon', SvgIcon);
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
deleted file mode 100644
index ef89fc6a..00000000
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Load commonly used dialogs immediately
-import AddCreaturePropertyDialog from '/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue';
-import CharacterCreationDialog from '/imports/ui/creature/character/CharacterCreationDialog.vue';
-import CastSpellWithSlotDialog from '/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue';
-import CreatureFormDialog from '/imports/ui/creature/CreatureFormDialog.vue';
-import CreaturePropertyCreationDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue';
-import CreaturePropertyDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue';
-import CreaturePropertyFromLibraryDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue';
-import CreatureRootDialog from '/imports/ui/creature/character/CreatureRootDialog.vue';
-import DeleteConfirmationDialog from '/imports/ui/dialogStack/DeleteConfirmationDialog.vue';
-import ExperienceInsertDialog from  '/imports/ui/creature/experiences/ExperienceInsertDialog.vue';
-import ExperienceListDialog from  '/imports/ui/creature/experiences/ExperienceListDialog.vue';
-import HelpDialog from  '/imports/ui/dialogStack/HelpDialog.vue';
-import LevelUpDialog from '/imports/ui/creature/slots/LevelUpDialog.vue';
-import SelectLibraryNodeDialog from '/imports/ui/library/SelectLibraryNodeDialog.vue';
-import SlotFillDialog from '/imports/ui/creature/slots/SlotFillDialog.vue';
-import TierTooLowDialog from '/imports/ui/user/TierTooLowDialog.vue';
-import TransferOwnershipDialog from '/imports/ui/sharing/TransferOwnershipDialog.vue';
-
-// Lazily load less common dialogs
-const ArchiveDialog = () => import('/imports/ui/creature/archive/ArchiveDialog.vue');
-const DeleteUserAccountDialog = () => import('/imports/ui/user/DeleteUserAccountDialog.vue');
-const InviteDialog = () => import('/imports/ui/user/InviteDialog.vue');
-const LibraryCollectionCreationDialog = () => import('/imports/ui/library/LibraryCollectionCreationDialog.vue');
-const LibraryCollectionEditDialog = () => import('/imports/ui/library/LibraryCollectionEditDialog.vue');
-const LibraryCreationDialog = () => import('/imports/ui/library/LibraryCreationDialog.vue');
-const LibraryEditDialog = () => import('/imports/ui/library/LibraryEditDialog.vue');
-const LibraryNodeCreationDialog = () => import('/imports/ui/library/LibraryNodeCreationDialog.vue');
-const LibraryNodeDialog = () => import('/imports/ui/library/LibraryNodeDialog.vue');
-const MoveLibraryNodeDialog = () => import('/imports/ui/library/MoveLibraryNodeDialog.vue');
-const SelectCreaturesDialog = () => import('/imports/ui/tabletop/SelectCreaturesDialog.vue');
-const ShareDialog = () => import('/imports/ui/sharing/ShareDialog.vue');
-const UsernameDialog = () => import('/imports/ui/user/UsernameDialog.vue');
-
-export default {
-  AddCreaturePropertyDialog,
-  ArchiveDialog,
-  CastSpellWithSlotDialog,
-  CharacterCreationDialog,
-  CreatureFormDialog,
-  CreaturePropertyCreationDialog,
-  CreaturePropertyDialog,
-  CreaturePropertyFromLibraryDialog,
-  CreatureRootDialog,
-  DeleteConfirmationDialog,
-  DeleteUserAccountDialog,
-  ExperienceInsertDialog,
-  ExperienceListDialog,
-  HelpDialog,
-  InviteDialog,
-  LevelUpDialog,
-  LibraryCollectionCreationDialog,
-  LibraryCollectionEditDialog,
-  LibraryCreationDialog,
-  LibraryEditDialog,
-  LibraryNodeCreationDialog,
-  LibraryNodeDialog,
-  MoveLibraryNodeDialog,
-  SelectCreaturesDialog,
-  SelectLibraryNodeDialog,
-  ShareDialog,
-  SlotFillDialog,
-  TierTooLowDialog,
-  TransferOwnershipDialog,
-  UsernameDialog,
-};
diff --git a/app/imports/ui/layouts/Sidebar.vue b/app/imports/ui/layouts/Sidebar.vue
deleted file mode 100644
index 31b5fa60..00000000
--- a/app/imports/ui/layouts/Sidebar.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-  <div class="sidebar">
-    <v-layout
-      v-if="!signedIn"
-      justify-center
-    >
-      <v-btn
-        text
-        to="/sign-in"
-      >
-        Sign in
-      </v-btn>
-    </v-layout>
-    <v-list>
-      <v-list-item v-if="signedIn">
-        <v-list-item-content>
-          <v-list-item-title>
-            {{ userName }}
-          </v-list-item-title>
-        </v-list-item-content>
-        <v-list-item-action>
-          <v-tooltip bottom>
-            <template
-              #activator="{ on }"
-            >
-              <v-btn
-                icon
-                to="/account"
-                v-on="on"
-              >
-                <v-icon>mdi-cog</v-icon>
-              </v-btn>
-            </template>
-            <span>Account Settings</span>
-          </v-tooltip>
-        </v-list-item-action>
-      </v-list-item>
-
-      <v-list-item
-        v-for="(link, i) in links"
-        :key="i"
-        :to="link.to"
-        :href="link.href"
-      >
-        <v-list-item-action>
-          <v-icon>{{ link.icon }}</v-icon>
-        </v-list-item-action>
-        <v-list-item-title>
-          {{ link.title }}
-        </v-list-item-title>
-        <v-icon v-if="link.href">
-          mdi-open-in-new
-        </v-icon>
-      </v-list-item>
-      <v-divider />
-    </v-list>
-    <creature-folder-list
-      dense
-      :creatures="CreaturesWithNoParty"
-      :folders="folders"
-    />
-  </div>
-</template>
-
-<script lang="js">
-  import Creatures from '/imports/api/creature/creatures/Creatures.js';
-  import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
-  import CreatureFolderList from '/imports/ui/creature/creatureList/CreatureFolderList.vue';
-  import getCreatureUrlName from '/imports/api/creature/creatures/getCreatureUrlName.js';
-
-  const characterTransform = function(char){
-    char.url = `/character/${char._id}/${getCreatureUrlName(char)}`;
-    char.initial = char.name && char.name[0] || '?';
-    return char;
-  };
-  export default {
-    components: {
-      CreatureFolderList
-    },
-    meteor: {
-      $subscribe: {
-        'characterList': [],
-      },
-      signedIn(){
-        return Meteor.userId();
-      },
-      userName(){
-        let user = Meteor.user();
-        return user && user.username || user && user._id;
-      },
-      links(){
-        let isLoggedIn = !!Meteor.userId();
-        let links = [
-          {title: 'Home', icon: 'mdi-home', to: '/'},
-          {title: 'Characters', icon: 'mdi-account-group', to: '/characterList', requireLogin: true},
-          {title: 'Library', icon: 'mdi-library-shelves', to: '/library', requireLogin: true},
-          //{title: 'Tabletops', icon: 'api', to: '/tabletops', requireLogin: true},
-          //{title: 'Friends', icon: 'people', to: '/friends', requireLogin: true},
-          {title: 'Files', icon: 'mdi-file-multiple', to: '/my-files'},
-          {title: 'Feedback', icon: 'mdi-bug', to: '/feedback'},
-          {title: 'About', icon: 'mdi-sign-text', to: '/about'},
-          {title: 'Documentation', icon: 'mdi-book-open-variant', to: '/docs'},
-          {title: 'Patreon', icon: 'mdi-patreon', href: 'https://www.patreon.com/dicecloud'},
-          {title: 'Github', icon: 'mdi-github', href: 'https://github.com/ThaumRystra/DiceCloud/tree/version-2'},
-        ];
-        return links.filter(link => !link.requireLogin || isLoggedIn);
-      },
-      folders(){
-        const userId = Meteor.userId();
-        let folders =  CreatureFolders.find(
-          {owner: userId, archived: {$ne: true}},
-          {sort: {order: 1}},
-        ).map(folder => {
-          folder.creatures = Creatures.find(
-            {
-              _id: {$in: folder.creatures || []},
-              $or: [{readers: userId}, {writers: userId}, {owner: userId}],
-            }, {
-              sort: {name: 1},
-            }
-          ).map(characterTransform);
-          return folder;
-        });
-        folders = folders.filter(folder => !!folder.creatures.length);
-        return folders;
-      },
-      CreaturesWithNoParty() {
-        var userId = Meteor.userId();
-        var charArrays = CreatureFolders.find({owner: userId}).map(p => p.creatures);
-        var folderChars = _.uniq(_.flatten(charArrays));
-        return Creatures.find(
-          {
-            _id: {$nin: folderChars},
-            $or: [{readers: userId}, {writers: userId}, {owner: userId}],
-          },
-          {sort: {name: 1}}
-        ).map(characterTransform);
-      },
-    },
-  };
-</script>
diff --git a/app/imports/ui/properties/forms/shared/propertyFormIndex.js b/app/imports/ui/properties/forms/shared/propertyFormIndex.js
deleted file mode 100644
index ef29ea2d..00000000
--- a/app/imports/ui/properties/forms/shared/propertyFormIndex.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import ActionForm from '/imports/ui/properties/forms/ActionForm.vue';
-import AdjustmentForm from '/imports/ui/properties/forms/AdjustmentForm.vue';
-import AttributeForm from '/imports/ui/properties/forms/AttributeForm.vue';
-import BuffForm from '/imports/ui/properties/forms/BuffForm.vue';
-import BuffRemoverForm from '/imports/ui/properties/forms/BuffRemoverForm.vue';
-import BranchForm from '/imports/ui/properties/forms/BranchForm.vue';
-import ClassForm from '/imports/ui/properties/forms/ClassForm.vue';
-import ClassLevelForm from '/imports/ui/properties/forms/ClassLevelForm.vue';
-import ConstantForm from '/imports/ui/properties/forms/ConstantForm.vue';
-import ContainerForm from '/imports/ui/properties/forms/ContainerForm.vue';
-import DamageForm from '/imports/ui/properties/forms/DamageForm.vue';
-import DamageMultiplierForm from '/imports/ui/properties/forms/DamageMultiplierForm.vue';
-import EffectForm from '/imports/ui/properties/forms/EffectForm.vue';
-import FeatureForm from '/imports/ui/properties/forms/FeatureForm.vue';
-import FolderForm from '/imports/ui/properties/forms/FolderForm.vue';
-import ItemForm from '/imports/ui/properties/forms/ItemForm.vue';
-import NoteForm from '/imports/ui/properties/forms/NoteForm.vue';
-import PointBuyForm from '/imports/ui/properties/forms/PointBuyForm.vue';
-import ProficiencyForm from '/imports/ui/properties/forms/ProficiencyForm.vue';
-import ReferenceForm from '/imports/ui/properties/forms/ReferenceForm.vue';
-import RollForm from '/imports/ui/properties/forms/RollForm.vue';
-import SavingThrowForm from '/imports/ui/properties/forms/SavingThrowForm.vue';
-import SkillForm from '/imports/ui/properties/forms/SkillForm.vue';
-import SlotForm from '/imports/ui/properties/forms/SlotForm.vue';
-import SlotFillerForm from '/imports/ui/properties/forms/SlotFillerForm.vue';
-import SpellListForm from '/imports/ui/properties/forms/SpellListForm.vue';
-import SpellForm from '/imports/ui/properties/forms/SpellForm.vue';
-import ToggleForm from '/imports/ui/properties/forms/ToggleForm.vue';
-import TriggerForm from '/imports/ui/properties/forms/TriggerForm.vue';
-
-export default {
-  action: ActionForm,
-  adjustment: AdjustmentForm,
-  attribute: AttributeForm,
-  buff: BuffForm,
-  buffRemover: BuffRemoverForm,
-  branch: BranchForm,
-  constant: ConstantForm,
-  container: ContainerForm,
-  class: ClassForm,
-  classLevel: ClassLevelForm,
-  damage: DamageForm,
-  damageMultiplier: DamageMultiplierForm,
-  effect: EffectForm,
-  feature: FeatureForm,
-  folder: FolderForm,
-  item: ItemForm,
-  note: NoteForm,
-  pointBuy: PointBuyForm,
-  proficiency: ProficiencyForm,
-  propertySlot: SlotForm,
-  reference: ReferenceForm,
-  roll: RollForm,
-  savingThrow: SavingThrowForm,
-  skill: SkillForm,
-  slotFiller: SlotFillerForm,
-  spellList: SpellListForm,
-  spell: SpellForm,
-  toggle: ToggleForm,
-  trigger: TriggerForm,
-};
diff --git a/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js b/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js
deleted file mode 100644
index 1f9772e8..00000000
--- a/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import DefaultTreeNode from '/imports/ui/properties/treeNodeViews/DefaultTreeNode.vue';
-import AdjustmentTreeNode from '/imports/ui/properties/treeNodeViews/AdjustmentTreeNode.vue';
-import BranchTreeNode from '/imports/ui/properties/treeNodeViews/BranchTreeNode.vue';
-import ItemTreeNode from '/imports/ui/properties/treeNodeViews/ItemTreeNode.vue';
-import DamageTreeNode from '/imports/ui/properties/treeNodeViews/DamageTreeNode.vue';
-import EffectTreeNode from '/imports/ui/properties/treeNodeViews/EffectTreeNode.vue';
-import ClassLevelTreeNode from '/imports/ui/properties/treeNodeViews/ClassLevelTreeNode.vue';
-import ProficiencyTreeNode from '/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue';
-import ReferenceTreeNode from '/imports/ui/properties/treeNodeViews/ReferenceTreeNode.vue';
-import SavingThrowTreeNode from '/imports/ui/properties/treeNodeViews/SavingThrowTreeNode.vue';
-
-export default {
-  default: DefaultTreeNode,
-  adjustment: AdjustmentTreeNode,
-  branch: BranchTreeNode,
-  classLevel: ClassLevelTreeNode,
-  damage: DamageTreeNode,
-  effect: EffectTreeNode,
-  item: ItemTreeNode,
-  proficiency: ProficiencyTreeNode,
-  reference: ReferenceTreeNode,
-  savingThrow: SavingThrowTreeNode,
-}
diff --git a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
deleted file mode 100644
index 70151b48..00000000
--- a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import ActionViewer from '/imports/ui/properties/viewers/ActionViewer.vue';
-import AdjustmentViewer from '/imports/ui/properties/viewers/AdjustmentViewer.vue';
-import AttributeViewer from '/imports/ui/properties/viewers/AttributeViewer.vue';
-import BuffViewer from '/imports/ui/properties/viewers/BuffViewer.vue';
-import BuffRemoverViewer from '/imports/ui/properties/viewers/BuffRemoverViewer.vue';
-import BranchViewer from '/imports/ui/properties/viewers/BranchViewer.vue';
-import ContainerViewer from '/imports/ui/properties/viewers/ContainerViewer.vue';
-import ClassViewer from '/imports/ui/properties/viewers/ClassViewer.vue';
-import ClassLevelViewer from '/imports/ui/properties/viewers/ClassLevelViewer.vue';
-import ConstantViewer from '/imports/ui/properties/viewers/ConstantViewer.vue';
-import DamageViewer from '/imports/ui/properties/viewers/DamageViewer.vue';
-import DamageMultiplierViewer from '/imports/ui/properties/viewers/DamageMultiplierViewer.vue';
-import EffectViewer from '/imports/ui/properties/viewers/EffectViewer.vue';
-import FeatureViewer from '/imports/ui/properties/viewers/FeatureViewer.vue';
-import FolderViewer from '/imports/ui/properties/viewers/FolderViewer.vue';
-import ItemViewer from '/imports/ui/properties/viewers/ItemViewer.vue';
-import NoteViewer from '/imports/ui/properties/viewers/NoteViewer.vue';
-import PointBuyViewer from '/imports/ui/properties/viewers/PointBuyViewer.vue';
-import ProficiencyViewer from '/imports/ui/properties/viewers/ProficiencyViewer.vue';
-import ReferenceViewer from '/imports/ui/properties/viewers/ReferenceViewer.vue';
-import RollViewer from '/imports/ui/properties/viewers/RollViewer.vue';
-import SkillViewer from '/imports/ui/properties/viewers/SkillViewer.vue';
-import SavingThrowViewer from '/imports/ui/properties/viewers/SavingThrowViewer.vue';
-import SlotViewer from '/imports/ui/properties/viewers/SlotViewer.vue';
-import SlotFillerViewer from '/imports/ui/properties/viewers/SlotFillerViewer.vue';
-import SpellListViewer from '/imports/ui/properties/viewers/SpellListViewer.vue';
-import SpellViewer from '/imports/ui/properties/viewers/SpellViewer.vue';
-import ToggleViewer from '/imports/ui/properties/viewers/ToggleViewer.vue';
-import TriggerViewer from '/imports/ui/properties/viewers/TriggerViewer.vue';
-
-export default {
-  action: ActionViewer,
-  adjustment: AdjustmentViewer,
-  attribute: AttributeViewer,
-  buff: BuffViewer,
-  buffRemover: BuffRemoverViewer,
-  branch: BranchViewer,
-  container: ContainerViewer,
-  class: ClassViewer,
-  classLevel: ClassLevelViewer,
-  constant: ConstantViewer,
-  damage: DamageViewer,
-  damageMultiplier: DamageMultiplierViewer,
-  effect: EffectViewer,
-  feature: FeatureViewer,
-  folder: FolderViewer,
-  item: ItemViewer,
-  note: NoteViewer,
-  pointBuy: PointBuyViewer,
-  proficiency: ProficiencyViewer,
-  propertySlot: SlotViewer,
-  roll: RollViewer,
-  reference: ReferenceViewer,
-  savingThrow: SavingThrowViewer,
-  slotFiller: SlotFillerViewer,
-  skill: SkillViewer,
-  spellList: SpellListViewer,
-  spell: SpellViewer,
-  toggle: ToggleViewer,
-  trigger: TriggerViewer,
-};
diff --git a/app/imports/ui/properties/viewers/shared/propertyViewerMixin.js b/app/imports/ui/properties/viewers/shared/propertyViewerMixin.js
deleted file mode 100644
index de4278f2..00000000
--- a/app/imports/ui/properties/viewers/shared/propertyViewerMixin.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import PropertyName from '/imports/ui/properties/viewers/shared/PropertyName.vue';
-import PropertyVariableName from '/imports/ui/properties/viewers/shared/PropertyVariableName.vue';
-import PropertyField from '/imports/ui/properties/viewers/shared/PropertyField.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
-import PropertyTags from '/imports/ui/properties/viewers/shared/PropertyTags.vue';
-
-const propertyViewerMixin = {
-  components: {
-    PropertyName,
-    PropertyVariableName,
-    PropertyField,
-    PropertyDescription,
-    PropertyTags,
-  },
-  props: {
-    model: {
-      type: Object,
-      required: true,
-    },
-  },
-};
-
-export default propertyViewerMixin;