diff --git a/app/imports/ui/StoryBook.vue b/app/imports/ui/StoryBook.vue
index d835d047..ecf826ac 100644
--- a/app/imports/ui/StoryBook.vue
+++ b/app/imports/ui/StoryBook.vue
@@ -39,20 +39,20 @@
 
 <script>
 	import Vue from "vue";
-	import AbilityListTile from '/imports/ui/creature/properties/attributes/AbilityListTile.Story.vue';
-	import AttributeCard from '/imports/ui/creature/properties/attributes/AttributeCard.Story.vue';
+	import AbilityListTile from '/imports/ui/properties/attributes/AbilityListTile.Story.vue';
+	import AttributeCard from '/imports/ui/properties/attributes/AttributeCard.Story.vue';
 	import ColorPicker from '/imports/ui/components/ColorPicker.Story.vue';
 	import ColumnLayout from "/imports/ui/components/ColumnLayout.Story.vue";
 	import DialogStack from '/imports/ui/dialogStack/DialogStack.Story.vue';
-	import EffectEditExpansionList from '/imports/ui/creature/properties/effects/EffectEditExpansionList.Story.vue';
-	import FeatureCard from '/imports/ui/creature/properties/features/FeatureCard.Story.vue';
-	import HealthBar from '/imports/ui/creature/properties/attributes/HealthBar.Story.vue';
-	import HitDiceListTile from '/imports/ui/creature/properties/attributes/HitDiceListTile.Story.vue';
+	import EffectEditExpansionList from '/imports/ui/properties/effects/EffectEditExpansionList.Story.vue';
+	import FeatureCard from '/imports/ui/properties/features/FeatureCard.Story.vue';
+	import HealthBar from '/imports/ui/properties/attributes/HealthBar.Story.vue';
+	import HitDiceListTile from '/imports/ui/properties/attributes/HitDiceListTile.Story.vue';
 	import IconSearch from '/imports/ui/components/IconSearch.Story.vue';
-	import ResourceCard from '/imports/ui/creature/properties/attributes/ResourceCard.Story.vue';
-	import SkillListTile from '/imports/ui/creature/properties/skills/SkillListTile.Story.vue';
+	import ResourceCard from '/imports/ui/properties/attributes/ResourceCard.Story.vue';
+	import SkillListTile from '/imports/ui/properties/skills/SkillListTile.Story.vue';
 	import SmartInput from '/imports/ui/components/global/SmartInput.Story.vue';
-	import SpellSlotListTile from '/imports/ui/creature/properties/attributes/SpellSlotListTile.Story.vue';
+	import SpellSlotListTile from '/imports/ui/properties/attributes/SpellSlotListTile.Story.vue';
 	import ToolbarLayout from '/imports/ui/layouts/ToolbarLayout.vue';
 	import TreeNode from '/imports/ui/components/tree/TreeNodeList.Story.vue';
 
diff --git a/app/imports/ui/creature/character/FeaturesTab.vue b/app/imports/ui/creature/character/FeaturesTab.vue
index 67aa6b1f..ad40d92e 100644
--- a/app/imports/ui/creature/character/FeaturesTab.vue
+++ b/app/imports/ui/creature/character/FeaturesTab.vue
@@ -26,7 +26,7 @@
 	import Features, { updateFeature } from '/imports/api/properties/Features.js';
 	import { insertFeature } from '/imports/api/properties/Features.js';
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-	import FeatureCard from '/imports/ui/creature/properties/features/FeatureCard.vue';
+	import FeatureCard from '/imports/ui/properties/features/FeatureCard.vue';
 	import { evaluateComputation, evaluateStringWithVariables } from '/imports/ui/utility/evaluate.js';
 
 	export default {
diff --git a/app/imports/ui/creature/character/StatsTab.vue b/app/imports/ui/creature/character/StatsTab.vue
index d93d59cb..e78a4dfd 100644
--- a/app/imports/ui/creature/character/StatsTab.vue
+++ b/app/imports/ui/creature/character/StatsTab.vue
@@ -140,14 +140,14 @@
 <script>
 	import Attributes from '/imports/api/properties/Attributes.js';
 	import Skills from '/imports/api/properties/Skills.js';
-	import AttributeCard from '/imports/ui/creature/properties/attributes/AttributeCard.vue';
-	import AbilityListTile from '/imports/ui/creature/properties/attributes/AbilityListTile.vue';
+	import AttributeCard from '/imports/ui/properties/attributes/AttributeCard.vue';
+	import AbilityListTile from '/imports/ui/properties/attributes/AbilityListTile.vue';
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-	import HealthBarCardContainer from '/imports/ui/creature/properties/attributes/HealthBarCardContainer.vue';
-	import HitDiceListTile from '/imports/ui/creature/properties/attributes/HitDiceListTile.vue';
-	import SkillListTile from '/imports/ui/creature/properties/skills/SkillListTile.vue';
-	import ResourceCard from '/imports/ui/creature/properties/attributes/ResourceCard.vue';
-	import SpellSlotListTile from '/imports/ui/creature/properties/attributes/SpellSlotListTile.vue';
+	import HealthBarCardContainer from '/imports/ui/properties/attributes/HealthBarCardContainer.vue';
+	import HitDiceListTile from '/imports/ui/properties/attributes/HitDiceListTile.vue';
+	import SkillListTile from '/imports/ui/properties/skills/SkillListTile.vue';
+	import ResourceCard from '/imports/ui/properties/attributes/ResourceCard.vue';
+	import SpellSlotListTile from '/imports/ui/properties/attributes/SpellSlotListTile.vue';
 
 	import { adjustAttribute, insertAttribute } from '/imports/api/properties/Attributes.js';
 
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
index 32624bce..efd5296a 100644
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ b/app/imports/ui/dialogStack/DialogComponentIndex.js
@@ -1,11 +1,11 @@
-import AttributeDialog from '/imports/ui/creature/properties/attributes/AttributeDialog.vue';
-import AttributeDialogContainer from '/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue';
-import AttributeCreationDialog from '/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue';
-import FeatureCreationDialog from '/imports/ui/creature/properties/features/FeatureCreationDialog.vue';
-import FeatureDialogContainer from '/imports/ui/creature/properties/features/FeatureDialogContainer.vue';
+import AttributeDialog from '/imports/ui/properties/attributes/AttributeDialog.vue';
+import AttributeDialogContainer from '/imports/ui/properties/attributes/AttributeDialogContainer.vue';
+import AttributeCreationDialog from '/imports/ui/properties/attributes/AttributeCreationDialog.vue';
+import FeatureCreationDialog from '/imports/ui/properties/features/FeatureCreationDialog.vue';
+import FeatureDialogContainer from '/imports/ui/properties/features/FeatureDialogContainer.vue';
 import LibraryCreationDialog from '/imports/ui/library/LibraryCreationDialog.vue';
 import LibraryNodeCreationDialog from '/imports/ui/library/LibraryNodeCreationDialog.vue';
-import SkillDialogContainer from '/imports/ui/creature/properties/skills/SkillDialogContainer.vue';
+import SkillDialogContainer from '/imports/ui/properties/skills/SkillDialogContainer.vue';
 
 export default {
   AttributeDialog,
diff --git a/app/imports/ui/library/LibraryNodeCreationDialog.vue b/app/imports/ui/library/LibraryNodeCreationDialog.vue
index 717b7c9d..9fcc52f3 100644
--- a/app/imports/ui/library/LibraryNodeCreationDialog.vue
+++ b/app/imports/ui/library/LibraryNodeCreationDialog.vue
@@ -17,7 +17,7 @@
 
 <script>
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import PropertySelector from '/imports/ui/creature/properties/PropertySelector.vue';
+import PropertySelector from '/imports/ui/properties/PropertySelector.vue';
 import LibraryNodeInsertForm from '/imports/ui/library/LibraryNodeInsertForm.vue';
 
 export default {
diff --git a/app/imports/ui/creature/properties/PropertySelector.vue b/app/imports/ui/properties/PropertySelector.vue
similarity index 100%
rename from app/imports/ui/creature/properties/PropertySelector.vue
rename to app/imports/ui/properties/PropertySelector.vue
diff --git a/app/imports/ui/creature/properties/attributes/AbilityListTile.Story.vue b/app/imports/ui/properties/attributes/AbilityListTile.Story.vue
similarity index 95%
rename from app/imports/ui/creature/properties/attributes/AbilityListTile.Story.vue
rename to app/imports/ui/properties/attributes/AbilityListTile.Story.vue
index 12403df1..cfbf312e 100644
--- a/app/imports/ui/creature/properties/attributes/AbilityListTile.Story.vue
+++ b/app/imports/ui/properties/attributes/AbilityListTile.Story.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-	import AbilityListTile from '/imports/ui/creature/properties/attributes/AbilityListTile.vue';
+	import AbilityListTile from '/imports/ui/properties/attributes/AbilityListTile.vue';
 	import store from "/imports/ui/vuexStore.js";
 
 	export default {
diff --git a/app/imports/ui/creature/properties/attributes/AbilityListTile.vue b/app/imports/ui/properties/attributes/AbilityListTile.vue
similarity index 100%
rename from app/imports/ui/creature/properties/attributes/AbilityListTile.vue
rename to app/imports/ui/properties/attributes/AbilityListTile.vue
diff --git a/app/imports/ui/creature/properties/attributes/AttributeCard.Story.vue b/app/imports/ui/properties/attributes/AttributeCard.Story.vue
similarity index 88%
rename from app/imports/ui/creature/properties/attributes/AttributeCard.Story.vue
rename to app/imports/ui/properties/attributes/AttributeCard.Story.vue
index aaf0bfe4..d80cf0e5 100644
--- a/app/imports/ui/creature/properties/attributes/AttributeCard.Story.vue
+++ b/app/imports/ui/properties/attributes/AttributeCard.Story.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-	import AttributeCard from '/imports/ui/creature/properties/attributes/AttributeCard.vue';
+	import AttributeCard from '/imports/ui/properties/attributes/AttributeCard.vue';
 	export default {
 		components: {
 			AttributeCard
diff --git a/app/imports/ui/creature/properties/attributes/AttributeCard.vue b/app/imports/ui/properties/attributes/AttributeCard.vue
similarity index 100%
rename from app/imports/ui/creature/properties/attributes/AttributeCard.vue
rename to app/imports/ui/properties/attributes/AttributeCard.vue
diff --git a/app/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue b/app/imports/ui/properties/attributes/AttributeCreationDialog.vue
similarity index 100%
rename from app/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue
rename to app/imports/ui/properties/attributes/AttributeCreationDialog.vue
diff --git a/app/imports/ui/creature/properties/attributes/AttributeDialog.vue b/app/imports/ui/properties/attributes/AttributeDialog.vue
similarity index 96%
rename from app/imports/ui/creature/properties/attributes/AttributeDialog.vue
rename to app/imports/ui/properties/attributes/AttributeDialog.vue
index d753a3b0..3edef5b2 100644
--- a/app/imports/ui/creature/properties/attributes/AttributeDialog.vue
+++ b/app/imports/ui/properties/attributes/AttributeDialog.vue
@@ -35,7 +35,7 @@
 
 <script>
 	import DialogBase from "/imports/ui/dialogStack/DialogBase.vue";
-	import EffectChildList from '/imports/ui/creature/properties/effects/EffectChildList.vue';
+	import EffectChildList from '/imports/ui/properties/effects/EffectChildList.vue';
 	import AttributeForm from '/imports/ui/forms/AttributeForm.vue';
 	import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 
diff --git a/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue b/app/imports/ui/properties/attributes/AttributeDialogContainer.vue
similarity index 92%
rename from app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue
rename to app/imports/ui/properties/attributes/AttributeDialogContainer.vue
index 77370695..fcee6de1 100644
--- a/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue
+++ b/app/imports/ui/properties/attributes/AttributeDialogContainer.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-	import AttributeDialog from '/imports/ui/creature/properties/attributes/AttributeDialog.vue';
+	import AttributeDialog from '/imports/ui/properties/attributes/AttributeDialog.vue';
 	import Attributes from '/imports/api/properties/Attributes.js';
 	import {
 		updateAttribute,
diff --git a/app/imports/ui/creature/properties/attributes/HealthBar.Story.vue b/app/imports/ui/properties/attributes/HealthBar.Story.vue
similarity index 92%
rename from app/imports/ui/creature/properties/attributes/HealthBar.Story.vue
rename to app/imports/ui/properties/attributes/HealthBar.Story.vue
index c9f997d9..5af29abf 100644
--- a/app/imports/ui/creature/properties/attributes/HealthBar.Story.vue
+++ b/app/imports/ui/properties/attributes/HealthBar.Story.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-	import HealthBar from '/imports/ui/creature/properties/attributes/HealthBar.vue';
+	import HealthBar from '/imports/ui/properties/attributes/HealthBar.vue';
 	export default {
 		data(){return{
 			value: 100,
diff --git a/app/imports/ui/creature/properties/attributes/HealthBar.vue b/app/imports/ui/properties/attributes/HealthBar.vue
similarity index 100%
rename from app/imports/ui/creature/properties/attributes/HealthBar.vue
rename to app/imports/ui/properties/attributes/HealthBar.vue
diff --git a/app/imports/ui/creature/properties/attributes/HealthBarCard.vue b/app/imports/ui/properties/attributes/HealthBarCard.vue
similarity index 86%
rename from app/imports/ui/creature/properties/attributes/HealthBarCard.vue
rename to app/imports/ui/properties/attributes/HealthBarCard.vue
index 28e644c9..a5485c41 100644
--- a/app/imports/ui/creature/properties/attributes/HealthBarCard.vue
+++ b/app/imports/ui/properties/attributes/HealthBarCard.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-	import HealthBar from '/imports/ui/creature/properties/attributes/HealthBar.vue';
+	import HealthBar from '/imports/ui/properties/attributes/HealthBar.vue';
 
 	export default {
 		props: {
diff --git a/app/imports/ui/creature/properties/attributes/HealthBarCardContainer.vue b/app/imports/ui/properties/attributes/HealthBarCardContainer.vue
similarity index 90%
rename from app/imports/ui/creature/properties/attributes/HealthBarCardContainer.vue
rename to app/imports/ui/properties/attributes/HealthBarCardContainer.vue
index 04393f75..29bd4cfe 100644
--- a/app/imports/ui/creature/properties/attributes/HealthBarCardContainer.vue
+++ b/app/imports/ui/properties/attributes/HealthBarCardContainer.vue
@@ -9,7 +9,7 @@
 <script>
 	import Attributes from '/imports/api/properties/Attributes.js';
 	import { adjustAttribute } from '/imports/api/properties/Attributes.js';
-	import HealthBarCard from '/imports/ui/creature/properties/attributes/HealthBarCard.vue';
+	import HealthBarCard from '/imports/ui/properties/attributes/HealthBarCard.vue';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/creature/properties/attributes/HitDiceListTile.Story.vue b/app/imports/ui/properties/attributes/HitDiceListTile.Story.vue
similarity index 91%
rename from app/imports/ui/creature/properties/attributes/HitDiceListTile.Story.vue
rename to app/imports/ui/properties/attributes/HitDiceListTile.Story.vue
index b36dfbf0..351af2e9 100644
--- a/app/imports/ui/creature/properties/attributes/HitDiceListTile.Story.vue
+++ b/app/imports/ui/properties/attributes/HitDiceListTile.Story.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-	import HitDiceListTile from '/imports/ui/creature/properties/attributes/HitDiceListTile.vue';
+	import HitDiceListTile from '/imports/ui/properties/attributes/HitDiceListTile.vue';
 	export default {
 		data(){ return{
 			hitDice: [
diff --git a/app/imports/ui/creature/properties/attributes/HitDiceListTile.vue b/app/imports/ui/properties/attributes/HitDiceListTile.vue
similarity index 100%
rename from app/imports/ui/creature/properties/attributes/HitDiceListTile.vue
rename to app/imports/ui/properties/attributes/HitDiceListTile.vue
diff --git a/app/imports/ui/creature/properties/attributes/ResourceCard.Story.vue b/app/imports/ui/properties/attributes/ResourceCard.Story.vue
similarity index 89%
rename from app/imports/ui/creature/properties/attributes/ResourceCard.Story.vue
rename to app/imports/ui/properties/attributes/ResourceCard.Story.vue
index 6dff8b6a..7576ba61 100644
--- a/app/imports/ui/creature/properties/attributes/ResourceCard.Story.vue
+++ b/app/imports/ui/properties/attributes/ResourceCard.Story.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-	import ResourceCard from '/imports/ui/creature/properties/attributes/ResourceCard.vue';
+	import ResourceCard from '/imports/ui/properties/attributes/ResourceCard.vue';
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
 
 	export default {
diff --git a/app/imports/ui/creature/properties/attributes/ResourceCard.vue b/app/imports/ui/properties/attributes/ResourceCard.vue
similarity index 100%
rename from app/imports/ui/creature/properties/attributes/ResourceCard.vue
rename to app/imports/ui/properties/attributes/ResourceCard.vue
diff --git a/app/imports/ui/creature/properties/attributes/SpellSlotListTile.Story.vue b/app/imports/ui/properties/attributes/SpellSlotListTile.Story.vue
similarity index 87%
rename from app/imports/ui/creature/properties/attributes/SpellSlotListTile.Story.vue
rename to app/imports/ui/properties/attributes/SpellSlotListTile.Story.vue
index f4fa1c9d..90c982bb 100644
--- a/app/imports/ui/creature/properties/attributes/SpellSlotListTile.Story.vue
+++ b/app/imports/ui/properties/attributes/SpellSlotListTile.Story.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-	import SpellSlotListTile from '/imports/ui/creature/properties/attributes/SpellSlotListTile.vue';
+	import SpellSlotListTile from '/imports/ui/properties/attributes/SpellSlotListTile.vue';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/creature/properties/attributes/SpellSlotListTile.vue b/app/imports/ui/properties/attributes/SpellSlotListTile.vue
similarity index 100%
rename from app/imports/ui/creature/properties/attributes/SpellSlotListTile.vue
rename to app/imports/ui/properties/attributes/SpellSlotListTile.vue
diff --git a/app/imports/ui/creature/properties/effects/EffectChildList.vue b/app/imports/ui/properties/effects/EffectChildList.vue
similarity index 87%
rename from app/imports/ui/creature/properties/effects/EffectChildList.vue
rename to app/imports/ui/properties/effects/EffectChildList.vue
index 79e82811..f988b179 100644
--- a/app/imports/ui/creature/properties/effects/EffectChildList.vue
+++ b/app/imports/ui/properties/effects/EffectChildList.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-	import EffectListTile from '/imports/ui/creature/properties/effects/EffectListTile.vue';
+	import EffectListTile from '/imports/ui/properties/effects/EffectListTile.vue';
 	import sortEffects from '/imports/ui/utility/sortEffects.js';
 
 	export default {
diff --git a/app/imports/ui/creature/properties/effects/EffectEditExpansionList.Story.vue b/app/imports/ui/properties/effects/EffectEditExpansionList.Story.vue
similarity index 94%
rename from app/imports/ui/creature/properties/effects/EffectEditExpansionList.Story.vue
rename to app/imports/ui/properties/effects/EffectEditExpansionList.Story.vue
index 8aecdfae..3f77a52e 100644
--- a/app/imports/ui/creature/properties/effects/EffectEditExpansionList.Story.vue
+++ b/app/imports/ui/properties/effects/EffectEditExpansionList.Story.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import EffectEditExpansionList from '/imports/ui/creature/properties/effects/EffectEditExpansionList.vue';
+import EffectEditExpansionList from '/imports/ui/properties/effects/EffectEditExpansionList.vue';
 export default {
 	data(){ return {
 		effects: [
diff --git a/app/imports/ui/creature/properties/effects/EffectEditExpansionList.vue b/app/imports/ui/properties/effects/EffectEditExpansionList.vue
similarity index 92%
rename from app/imports/ui/creature/properties/effects/EffectEditExpansionList.vue
rename to app/imports/ui/properties/effects/EffectEditExpansionList.vue
index 3f336ff2..2a52adce 100644
--- a/app/imports/ui/creature/properties/effects/EffectEditExpansionList.vue
+++ b/app/imports/ui/properties/effects/EffectEditExpansionList.vue
@@ -25,7 +25,7 @@
 
 <script>
 	import EffectForm from '/imports/ui/forms/EffectForm.vue';
-	import EffectListTile from '/imports/ui/creature/properties/effects/EffectListTile.vue';
+	import EffectListTile from '/imports/ui/properties/effects/EffectListTile.vue';
 	export default {
 		props: {
 			effects: Array,
diff --git a/app/imports/ui/creature/properties/effects/EffectListTile.vue b/app/imports/ui/properties/effects/EffectListTile.vue
similarity index 100%
rename from app/imports/ui/creature/properties/effects/EffectListTile.vue
rename to app/imports/ui/properties/effects/EffectListTile.vue
diff --git a/app/imports/ui/creature/properties/features/FeatureCard.Story.vue b/app/imports/ui/properties/features/FeatureCard.Story.vue
similarity index 90%
rename from app/imports/ui/creature/properties/features/FeatureCard.Story.vue
rename to app/imports/ui/properties/features/FeatureCard.Story.vue
index 89f60f88..e021a100 100644
--- a/app/imports/ui/creature/properties/features/FeatureCard.Story.vue
+++ b/app/imports/ui/properties/features/FeatureCard.Story.vue
@@ -13,7 +13,7 @@
 
 <script>
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-	import FeatureCard from '/imports/ui/creature/properties/features/FeatureCard.vue';
+	import FeatureCard from '/imports/ui/properties/features/FeatureCard.vue';
 
 	export default {
 		dontWrap: true,
diff --git a/app/imports/ui/creature/properties/features/FeatureCard.vue b/app/imports/ui/properties/features/FeatureCard.vue
similarity index 100%
rename from app/imports/ui/creature/properties/features/FeatureCard.vue
rename to app/imports/ui/properties/features/FeatureCard.vue
diff --git a/app/imports/ui/creature/properties/features/FeatureCreationDialog.vue b/app/imports/ui/properties/features/FeatureCreationDialog.vue
similarity index 100%
rename from app/imports/ui/creature/properties/features/FeatureCreationDialog.vue
rename to app/imports/ui/properties/features/FeatureCreationDialog.vue
diff --git a/app/imports/ui/creature/properties/features/FeatureDialog.vue b/app/imports/ui/properties/features/FeatureDialog.vue
similarity index 100%
rename from app/imports/ui/creature/properties/features/FeatureDialog.vue
rename to app/imports/ui/properties/features/FeatureDialog.vue
diff --git a/app/imports/ui/creature/properties/features/FeatureDialogContainer.vue b/app/imports/ui/properties/features/FeatureDialogContainer.vue
similarity index 90%
rename from app/imports/ui/creature/properties/features/FeatureDialogContainer.vue
rename to app/imports/ui/properties/features/FeatureDialogContainer.vue
index 9321bf98..8f44af44 100644
--- a/app/imports/ui/creature/properties/features/FeatureDialogContainer.vue
+++ b/app/imports/ui/properties/features/FeatureDialogContainer.vue
@@ -8,7 +8,7 @@
 
 <script>
 	import Features, {updateFeature} from '/imports/api/properties/Features.js';
-	import FeatureDialog from '/imports/ui/creature/properties/features/FeatureDialog.vue';
+	import FeatureDialog from '/imports/ui/properties/features/FeatureDialog.vue';
 	import {evaluateStringForCharId} from '/imports/ui/utility/evaluate.js';
 
 	export default {
diff --git a/app/imports/ui/creature/properties/skills/SkillDialog.vue b/app/imports/ui/properties/skills/SkillDialog.vue
similarity index 87%
rename from app/imports/ui/creature/properties/skills/SkillDialog.vue
rename to app/imports/ui/properties/skills/SkillDialog.vue
index 5aa34b10..203116a7 100644
--- a/app/imports/ui/creature/properties/skills/SkillDialog.vue
+++ b/app/imports/ui/properties/skills/SkillDialog.vue
@@ -27,11 +27,11 @@
 </template>
 
 <script>
-	import EffectChildList from '/imports/ui/creature/properties/effects/EffectChildList.vue';
+	import EffectChildList from '/imports/ui/properties/effects/EffectChildList.vue';
 	import DialogBase from "/imports/ui/dialogStack/DialogBase.vue";
-	import SkillEdit from '/imports/ui/creature/properties/skills/SkillEdit.vue';
-	import SkillProficiencyList from '/imports/ui/creature/properties/skills/SkillProficiencyList.vue';
-	import SkillListTile from '/imports/ui/creature/properties/skills/SkillListTile.vue';
+	import SkillEdit from '/imports/ui/properties/skills/SkillEdit.vue';
+	import SkillProficiencyList from '/imports/ui/properties/skills/SkillProficiencyList.vue';
+	import SkillListTile from '/imports/ui/properties/skills/SkillListTile.vue';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/creature/properties/skills/SkillDialogContainer.vue b/app/imports/ui/properties/skills/SkillDialogContainer.vue
similarity index 95%
rename from app/imports/ui/creature/properties/skills/SkillDialogContainer.vue
rename to app/imports/ui/properties/skills/SkillDialogContainer.vue
index 7c403bcc..445f7227 100644
--- a/app/imports/ui/creature/properties/skills/SkillDialogContainer.vue
+++ b/app/imports/ui/properties/skills/SkillDialogContainer.vue
@@ -10,7 +10,7 @@
 
 <script>
 
-	import SkillDialog from '/imports/ui/creature/properties/skills/SkillDialog.vue';
+	import SkillDialog from '/imports/ui/properties/skills/SkillDialog.vue';
 	import Skills from '/imports/api/properties/Skills.js';
 	import { updateSkill } from '/imports/api/properties/Skills.js';
 	import Attributes from '/imports/api/properties/Attributes.js';
diff --git a/app/imports/ui/creature/properties/skills/SkillEdit.vue b/app/imports/ui/properties/skills/SkillEdit.vue
similarity index 100%
rename from app/imports/ui/creature/properties/skills/SkillEdit.vue
rename to app/imports/ui/properties/skills/SkillEdit.vue
diff --git a/app/imports/ui/creature/properties/skills/SkillListTile.Story.vue b/app/imports/ui/properties/skills/SkillListTile.Story.vue
similarity index 90%
rename from app/imports/ui/creature/properties/skills/SkillListTile.Story.vue
rename to app/imports/ui/properties/skills/SkillListTile.Story.vue
index 0dd2d8e4..dd817e3f 100644
--- a/app/imports/ui/creature/properties/skills/SkillListTile.Story.vue
+++ b/app/imports/ui/properties/skills/SkillListTile.Story.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-	import SkillListTile from '/imports/ui/creature/properties/skills/SkillListTile.vue';
+	import SkillListTile from '/imports/ui/properties/skills/SkillListTile.vue';
 	export default {
 		data(){return {
 			skills: [
diff --git a/app/imports/ui/creature/properties/skills/SkillListTile.vue b/app/imports/ui/properties/skills/SkillListTile.vue
similarity index 100%
rename from app/imports/ui/creature/properties/skills/SkillListTile.vue
rename to app/imports/ui/properties/skills/SkillListTile.vue
diff --git a/app/imports/ui/creature/properties/skills/SkillProficiencyList.vue b/app/imports/ui/properties/skills/SkillProficiencyList.vue
similarity index 100%
rename from app/imports/ui/creature/properties/skills/SkillProficiencyList.vue
rename to app/imports/ui/properties/skills/SkillProficiencyList.vue