diff --git a/app/imports/api/library/LibraryNodes.js b/app/imports/api/library/LibraryNodes.js
index f9e72782..3df46242 100644
--- a/app/imports/api/library/LibraryNodes.js
+++ b/app/imports/api/library/LibraryNodes.js
@@ -16,7 +16,7 @@ let LibraryNodeSchema = schema({
   },
 });
 
-for (key in librarySchemas){
+for (let key in librarySchemas){
 	let schema = new SimpleSchema({});
 	schema.extend(librarySchemas[key]);
 	schema.extend(LibraryNodeSchema);
diff --git a/app/imports/ui/StoryBook.vue b/app/imports/ui/StoryBook.vue
index a2323e21..cc089ad4 100644
--- a/app/imports/ui/StoryBook.vue
+++ b/app/imports/ui/StoryBook.vue
@@ -39,22 +39,22 @@
 
 <script>
 	import Vue from "vue";
-	import AbilityListTile from '/imports/ui/components/attributes/AbilityListTile.Story.vue';
-	import AttributeCard from '/imports/ui/components/attributes/AttributeCard.Story.vue';
-	import AttributeEdit from '/imports/ui/components/attributes/AttributeEdit.Story.vue';
+	import AbilityListTile from '/imports/ui/creature/properties/attributes/AbilityListTile.Story.vue';
+	import AttributeCard from '/imports/ui/creature/properties/attributes/AttributeCard.Story.vue';
+	import AttributeEdit from '/imports/ui/creature/properties/attributes/AttributeEdit.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 EffectEdit from '/imports/ui/components/children/effects/EffectEdit.Story.vue';
-	import EffectEditExpansionList from '/imports/ui/components/children/effects/EffectEditExpansionList.Story.vue';
-	import FeatureCard from '/imports/ui/components/features/FeatureCard.Story.vue';
-	import HealthBar from '/imports/ui/components/attributes/HealthBar.Story.vue';
-	import HitDiceListTile from '/imports/ui/components/attributes/HitDiceListTile.Story.vue';
+	import EffectEdit from '/imports/ui/creature/properties/effects/EffectEdit.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 IconSearch from '/imports/ui/components/IconSearch.Story.vue';
-	import ResourceCard from '/imports/ui/components/attributes/ResourceCard.Story.vue';
-	import SkillListTile from '/imports/ui/components/skills/SkillListTile.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 SmartInput from '/imports/ui/components/global/SmartInput.Story.vue';
-	import SpellSlotListTile from '/imports/ui/components/attributes/SpellSlotListTile.Story.vue';
+	import SpellSlotListTile from '/imports/ui/creature/properties/attributes/SpellSlotListTile.Story.vue';
 	import ToolbarLayout from '/imports/ui/layouts/ToolbarLayout.vue';
 
 	export default {
diff --git a/app/imports/ui/character/CharacterCreationDialog.vue b/app/imports/ui/creature/character/CharacterCreationDialog.vue
similarity index 100%
rename from app/imports/ui/character/CharacterCreationDialog.vue
rename to app/imports/ui/creature/character/CharacterCreationDialog.vue
diff --git a/app/imports/ui/character/CharacterSheet.vue b/app/imports/ui/creature/character/CharacterSheet.vue
similarity index 89%
rename from app/imports/ui/character/CharacterSheet.vue
rename to app/imports/ui/creature/character/CharacterSheet.vue
index 20428a75..2ae3ac72 100644
--- a/app/imports/ui/character/CharacterSheet.vue
+++ b/app/imports/ui/creature/character/CharacterSheet.vue
@@ -48,9 +48,9 @@
 	import isDarkColor from '/imports/ui/utility/isDarkColor.js';
 	import { mapMutations } from "vuex";
 	import { theme } from '/imports/ui/theme.js';
-	import StatsTab from '/imports/ui/character/StatsTab.vue';
-	import FeaturesTab from '/imports/ui/character/FeaturesTab.vue';
-	import CharacterTreeView from '/imports/ui/character/CharacterTreeView.vue';
+	import StatsTab from '/imports/ui/creature/character/StatsTab.vue';
+	import FeaturesTab from '/imports/ui/creature/character/FeaturesTab.vue';
+	import CharacterTreeView from '/imports/ui/creature/character/CharacterTreeView.vue';
 	import { recomputeCreature } from '/imports/api/creature/creatureComputation.js'
 
 	export default {
diff --git a/app/imports/ui/character/CharacterTreeView.vue b/app/imports/ui/creature/character/CharacterTreeView.vue
similarity index 100%
rename from app/imports/ui/character/CharacterTreeView.vue
rename to app/imports/ui/creature/character/CharacterTreeView.vue
diff --git a/app/imports/ui/character/FeaturesTab.vue b/app/imports/ui/creature/character/FeaturesTab.vue
similarity index 96%
rename from app/imports/ui/character/FeaturesTab.vue
rename to app/imports/ui/creature/character/FeaturesTab.vue
index 7ffd4dbe..ad07013a 100644
--- a/app/imports/ui/character/FeaturesTab.vue
+++ b/app/imports/ui/creature/character/FeaturesTab.vue
@@ -26,7 +26,7 @@
 	import Features, { updateFeature } from '/imports/api/creature/properties/Features.js';
 	import { insertFeature } from '/imports/api/creature/properties/Features.js';
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-	import FeatureCard from '/imports/ui/components/features/FeatureCard.vue';
+	import FeatureCard from '/imports/ui/creature/properties/features/FeatureCard.vue';
 	import { evaluateComputation, evaluateStringWithVariables } from '/imports/ui/utility/evaluate.js';
 
 	export default {
diff --git a/app/imports/ui/character/StatsTab.vue b/app/imports/ui/creature/character/StatsTab.vue
similarity index 90%
rename from app/imports/ui/character/StatsTab.vue
rename to app/imports/ui/creature/character/StatsTab.vue
index cadf257b..2ffcbea0 100644
--- a/app/imports/ui/character/StatsTab.vue
+++ b/app/imports/ui/creature/character/StatsTab.vue
@@ -140,14 +140,14 @@
 <script>
 	import Attributes from '/imports/api/creature/properties/Attributes.js';
 	import Skills from '/imports/api/creature/properties/Skills.js';
-	import AttributeCard from '/imports/ui/components/attributes/AttributeCard.vue';
-	import AbilityListTile from '/imports/ui/components/attributes/AbilityListTile.vue';
+	import AttributeCard from '/imports/ui/creature/properties/attributes/AttributeCard.vue';
+	import AbilityListTile from '/imports/ui/creature/properties/attributes/AbilityListTile.vue';
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-	import HealthBarCardContainer from '/imports/ui/components/attributes/HealthBarCardContainer.vue';
-	import HitDiceListTile from '/imports/ui/components/attributes/HitDiceListTile.vue';
-	import SkillListTile from '/imports/ui/components/skills/SkillListTile.vue';
-	import ResourceCard from '/imports/ui/components/attributes/ResourceCard.vue';
-	import SpellSlotListTile from '/imports/ui/components/attributes/SpellSlotListTile.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 { adjustAttribute, insertAttribute } from '/imports/api/creature/properties/Attributes.js';
 
diff --git a/app/imports/ui/components/attributes/AbilityListTile.Story.vue b/app/imports/ui/creature/properties/attributes/AbilityListTile.Story.vue
similarity index 95%
rename from app/imports/ui/components/attributes/AbilityListTile.Story.vue
rename to app/imports/ui/creature/properties/attributes/AbilityListTile.Story.vue
index abf5b520..12403df1 100644
--- a/app/imports/ui/components/attributes/AbilityListTile.Story.vue
+++ b/app/imports/ui/creature/properties/attributes/AbilityListTile.Story.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-	import AbilityListTile from '/imports/ui/components/attributes/AbilityListTile.vue';
+	import AbilityListTile from '/imports/ui/creature/properties/attributes/AbilityListTile.vue';
 	import store from "/imports/ui/vuexStore.js";
 
 	export default {
diff --git a/app/imports/ui/components/attributes/AbilityListTile.vue b/app/imports/ui/creature/properties/attributes/AbilityListTile.vue
similarity index 100%
rename from app/imports/ui/components/attributes/AbilityListTile.vue
rename to app/imports/ui/creature/properties/attributes/AbilityListTile.vue
diff --git a/app/imports/ui/components/attributes/AttributeCard.Story.vue b/app/imports/ui/creature/properties/attributes/AttributeCard.Story.vue
similarity index 88%
rename from app/imports/ui/components/attributes/AttributeCard.Story.vue
rename to app/imports/ui/creature/properties/attributes/AttributeCard.Story.vue
index 5a215ec5..aaf0bfe4 100644
--- a/app/imports/ui/components/attributes/AttributeCard.Story.vue
+++ b/app/imports/ui/creature/properties/attributes/AttributeCard.Story.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-	import AttributeCard from '/imports/ui/components/attributes/AttributeCard.vue';
+	import AttributeCard from '/imports/ui/creature/properties/attributes/AttributeCard.vue';
 	export default {
 		components: {
 			AttributeCard
diff --git a/app/imports/ui/components/attributes/AttributeCard.vue b/app/imports/ui/creature/properties/attributes/AttributeCard.vue
similarity index 100%
rename from app/imports/ui/components/attributes/AttributeCard.vue
rename to app/imports/ui/creature/properties/attributes/AttributeCard.vue
diff --git a/app/imports/ui/components/attributes/AttributeCreationDialog.vue b/app/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue
similarity index 95%
rename from app/imports/ui/components/attributes/AttributeCreationDialog.vue
rename to app/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue
index e384226a..1dfcc7ff 100644
--- a/app/imports/ui/components/attributes/AttributeCreationDialog.vue
+++ b/app/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-	import AttributeEdit from '/imports/ui/components/attributes/AttributeEdit.vue';
+	import AttributeEdit from '/imports/ui/creature/properties/attributes/AttributeEdit.vue';
 	import Attributes from '/imports/api/creature/properties/Attributes.js';
 	import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
 
diff --git a/app/imports/ui/components/attributes/AttributeDialog.vue b/app/imports/ui/creature/properties/attributes/AttributeDialog.vue
similarity index 93%
rename from app/imports/ui/components/attributes/AttributeDialog.vue
rename to app/imports/ui/creature/properties/attributes/AttributeDialog.vue
index 81a1ae60..6abe686f 100644
--- a/app/imports/ui/components/attributes/AttributeDialog.vue
+++ b/app/imports/ui/creature/properties/attributes/AttributeDialog.vue
@@ -35,8 +35,8 @@
 
 <script>
 	import DialogBase from "/imports/ui/dialogStack/DialogBase.vue";
-	import EffectChildList from '/imports/ui/components/children/effects/EffectChildList.vue';
-	import AttributeEdit from '/imports/ui/components/attributes/AttributeEdit.vue';
+	import EffectChildList from '/imports/ui/creature/properties/effects/EffectChildList.vue';
+	import AttributeEdit from '/imports/ui/creature/properties/attributes/AttributeEdit.vue';
 	import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 
 	export default {
diff --git a/app/imports/ui/components/attributes/AttributeDialogContainer.vue b/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue
similarity index 92%
rename from app/imports/ui/components/attributes/AttributeDialogContainer.vue
rename to app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue
index f0be0a83..2215dd89 100644
--- a/app/imports/ui/components/attributes/AttributeDialogContainer.vue
+++ b/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-	import AttributeDialog from '/imports/ui/components/attributes/AttributeDialog.vue';
+	import AttributeDialog from '/imports/ui/creature/properties/attributes/AttributeDialog.vue';
 	import Attributes from '/imports/api/creature/properties/Attributes.js';
 	import {
 		updateAttribute,
diff --git a/app/imports/ui/components/attributes/AttributeEdit.Story.vue b/app/imports/ui/creature/properties/attributes/AttributeEdit.Story.vue
similarity index 92%
rename from app/imports/ui/components/attributes/AttributeEdit.Story.vue
rename to app/imports/ui/creature/properties/attributes/AttributeEdit.Story.vue
index dabdfddb..b2359963 100644
--- a/app/imports/ui/components/attributes/AttributeEdit.Story.vue
+++ b/app/imports/ui/creature/properties/attributes/AttributeEdit.Story.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-	import AttributeEdit from '/imports/ui/components/attributes/AttributeEdit.vue';
+	import AttributeEdit from '/imports/ui/creature/properties/attributes/AttributeEdit.vue';
 	import debounceUpdate from '/imports/ui/utility/debounceUpdate.js';
 	export default {
 		components: {
diff --git a/app/imports/ui/components/attributes/AttributeEdit.vue b/app/imports/ui/creature/properties/attributes/AttributeEdit.vue
similarity index 100%
rename from app/imports/ui/components/attributes/AttributeEdit.vue
rename to app/imports/ui/creature/properties/attributes/AttributeEdit.vue
diff --git a/app/imports/ui/components/attributes/HealthBar.Story.vue b/app/imports/ui/creature/properties/attributes/HealthBar.Story.vue
similarity index 92%
rename from app/imports/ui/components/attributes/HealthBar.Story.vue
rename to app/imports/ui/creature/properties/attributes/HealthBar.Story.vue
index 3ecba5db..c9f997d9 100644
--- a/app/imports/ui/components/attributes/HealthBar.Story.vue
+++ b/app/imports/ui/creature/properties/attributes/HealthBar.Story.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-	import HealthBar from '/imports/ui/components/attributes/HealthBar.vue';
+	import HealthBar from '/imports/ui/creature/properties/attributes/HealthBar.vue';
 	export default {
 		data(){return{
 			value: 100,
diff --git a/app/imports/ui/components/attributes/HealthBar.vue b/app/imports/ui/creature/properties/attributes/HealthBar.vue
similarity index 100%
rename from app/imports/ui/components/attributes/HealthBar.vue
rename to app/imports/ui/creature/properties/attributes/HealthBar.vue
diff --git a/app/imports/ui/components/attributes/HealthBarCard.vue b/app/imports/ui/creature/properties/attributes/HealthBarCard.vue
similarity index 86%
rename from app/imports/ui/components/attributes/HealthBarCard.vue
rename to app/imports/ui/creature/properties/attributes/HealthBarCard.vue
index 9c1f9889..28e644c9 100644
--- a/app/imports/ui/components/attributes/HealthBarCard.vue
+++ b/app/imports/ui/creature/properties/attributes/HealthBarCard.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-	import HealthBar from '/imports/ui/components/attributes/HealthBar.vue';
+	import HealthBar from '/imports/ui/creature/properties/attributes/HealthBar.vue';
 
 	export default {
 		props: {
diff --git a/app/imports/ui/components/attributes/HealthBarCardContainer.vue b/app/imports/ui/creature/properties/attributes/HealthBarCardContainer.vue
similarity index 90%
rename from app/imports/ui/components/attributes/HealthBarCardContainer.vue
rename to app/imports/ui/creature/properties/attributes/HealthBarCardContainer.vue
index 423f64e4..fd04e5d1 100644
--- a/app/imports/ui/components/attributes/HealthBarCardContainer.vue
+++ b/app/imports/ui/creature/properties/attributes/HealthBarCardContainer.vue
@@ -9,7 +9,7 @@
 <script>
 	import Attributes from '/imports/api/creature/properties/Attributes.js';
 	import { adjustAttribute } from '/imports/api/creature/properties/Attributes.js';
-	import HealthBarCard from '/imports/ui/components/attributes/HealthBarCard.vue';
+	import HealthBarCard from '/imports/ui/creature/properties/attributes/HealthBarCard.vue';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/components/attributes/HitDiceListTile.Story.vue b/app/imports/ui/creature/properties/attributes/HitDiceListTile.Story.vue
similarity index 91%
rename from app/imports/ui/components/attributes/HitDiceListTile.Story.vue
rename to app/imports/ui/creature/properties/attributes/HitDiceListTile.Story.vue
index e82b4487..b36dfbf0 100644
--- a/app/imports/ui/components/attributes/HitDiceListTile.Story.vue
+++ b/app/imports/ui/creature/properties/attributes/HitDiceListTile.Story.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-	import HitDiceListTile from '/imports/ui/components/attributes/HitDiceListTile.vue';
+	import HitDiceListTile from '/imports/ui/creature/properties/attributes/HitDiceListTile.vue';
 	export default {
 		data(){ return{
 			hitDice: [
diff --git a/app/imports/ui/components/attributes/HitDiceListTile.vue b/app/imports/ui/creature/properties/attributes/HitDiceListTile.vue
similarity index 100%
rename from app/imports/ui/components/attributes/HitDiceListTile.vue
rename to app/imports/ui/creature/properties/attributes/HitDiceListTile.vue
diff --git a/app/imports/ui/components/attributes/ResourceCard.Story.vue b/app/imports/ui/creature/properties/attributes/ResourceCard.Story.vue
similarity index 89%
rename from app/imports/ui/components/attributes/ResourceCard.Story.vue
rename to app/imports/ui/creature/properties/attributes/ResourceCard.Story.vue
index b5070640..6dff8b6a 100644
--- a/app/imports/ui/components/attributes/ResourceCard.Story.vue
+++ b/app/imports/ui/creature/properties/attributes/ResourceCard.Story.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-	import ResourceCard from '/imports/ui/components/attributes/ResourceCard.vue';
+	import ResourceCard from '/imports/ui/creature/properties/attributes/ResourceCard.vue';
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
 
 	export default {
diff --git a/app/imports/ui/components/attributes/ResourceCard.vue b/app/imports/ui/creature/properties/attributes/ResourceCard.vue
similarity index 100%
rename from app/imports/ui/components/attributes/ResourceCard.vue
rename to app/imports/ui/creature/properties/attributes/ResourceCard.vue
diff --git a/app/imports/ui/components/attributes/SpellSlotListTile.Story.vue b/app/imports/ui/creature/properties/attributes/SpellSlotListTile.Story.vue
similarity index 87%
rename from app/imports/ui/components/attributes/SpellSlotListTile.Story.vue
rename to app/imports/ui/creature/properties/attributes/SpellSlotListTile.Story.vue
index 489f069d..f4fa1c9d 100644
--- a/app/imports/ui/components/attributes/SpellSlotListTile.Story.vue
+++ b/app/imports/ui/creature/properties/attributes/SpellSlotListTile.Story.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-	import SpellSlotListTile from '/imports/ui/components/attributes/SpellSlotListTile.vue';
+	import SpellSlotListTile from '/imports/ui/creature/properties/attributes/SpellSlotListTile.vue';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/components/attributes/SpellSlotListTile.vue b/app/imports/ui/creature/properties/attributes/SpellSlotListTile.vue
similarity index 100%
rename from app/imports/ui/components/attributes/SpellSlotListTile.vue
rename to app/imports/ui/creature/properties/attributes/SpellSlotListTile.vue
diff --git a/app/imports/ui/components/children/effects/EffectChildList.vue b/app/imports/ui/creature/properties/effects/EffectChildList.vue
similarity index 91%
rename from app/imports/ui/components/children/effects/EffectChildList.vue
rename to app/imports/ui/creature/properties/effects/EffectChildList.vue
index 0c350c4a..79e82811 100644
--- a/app/imports/ui/components/children/effects/EffectChildList.vue
+++ b/app/imports/ui/creature/properties/effects/EffectChildList.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-	import EffectListTile from '/imports/ui/components/children/effects/EffectListTile.vue';
+	import EffectListTile from '/imports/ui/creature/properties/effects/EffectListTile.vue';
 	import sortEffects from '/imports/ui/utility/sortEffects.js';
 
 	export default {
diff --git a/app/imports/ui/components/children/effects/EffectEdit.Story.vue b/app/imports/ui/creature/properties/effects/EffectEdit.Story.vue
similarity index 93%
rename from app/imports/ui/components/children/effects/EffectEdit.Story.vue
rename to app/imports/ui/creature/properties/effects/EffectEdit.Story.vue
index 930a3271..3d771a27 100644
--- a/app/imports/ui/components/children/effects/EffectEdit.Story.vue
+++ b/app/imports/ui/creature/properties/effects/EffectEdit.Story.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import EffectEdit from '/imports/ui/components/children/effects/EffectEdit.vue';
+import EffectEdit from '/imports/ui/creature/properties/effects/EffectEdit.vue';
 export default {
 	data(){ return {
 		effects: [
diff --git a/app/imports/ui/components/children/effects/EffectEdit.vue b/app/imports/ui/creature/properties/effects/EffectEdit.vue
similarity index 100%
rename from app/imports/ui/components/children/effects/EffectEdit.vue
rename to app/imports/ui/creature/properties/effects/EffectEdit.vue
diff --git a/app/imports/ui/components/children/effects/EffectEditExpansionList.Story.vue b/app/imports/ui/creature/properties/effects/EffectEditExpansionList.Story.vue
similarity index 94%
rename from app/imports/ui/components/children/effects/EffectEditExpansionList.Story.vue
rename to app/imports/ui/creature/properties/effects/EffectEditExpansionList.Story.vue
index c2d85dfb..8aecdfae 100644
--- a/app/imports/ui/components/children/effects/EffectEditExpansionList.Story.vue
+++ b/app/imports/ui/creature/properties/effects/EffectEditExpansionList.Story.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import EffectEditExpansionList from '/imports/ui/components/children/effects/EffectEditExpansionList.vue';
+import EffectEditExpansionList from '/imports/ui/creature/properties/effects/EffectEditExpansionList.vue';
 export default {
 	data(){ return {
 		effects: [
diff --git a/app/imports/ui/components/children/effects/EffectEditExpansionList.vue b/app/imports/ui/creature/properties/effects/EffectEditExpansionList.vue
similarity index 89%
rename from app/imports/ui/components/children/effects/EffectEditExpansionList.vue
rename to app/imports/ui/creature/properties/effects/EffectEditExpansionList.vue
index ff561e89..49eb2cb7 100644
--- a/app/imports/ui/components/children/effects/EffectEditExpansionList.vue
+++ b/app/imports/ui/creature/properties/effects/EffectEditExpansionList.vue
@@ -24,8 +24,8 @@
 </template>
 
 <script>
-	import EffectEdit from '/imports/ui/components/children/effects/EffectEdit.vue';
-	import EffectListTile from '/imports/ui/components/children/effects/EffectListTile.vue';
+	import EffectEdit from '/imports/ui/creature/properties/effects/EffectEdit.vue';
+	import EffectListTile from '/imports/ui/creature/properties/effects/EffectListTile.vue';
 	export default {
 		props: {
 			effects: Array,
diff --git a/app/imports/ui/components/children/effects/EffectListTile.vue b/app/imports/ui/creature/properties/effects/EffectListTile.vue
similarity index 100%
rename from app/imports/ui/components/children/effects/EffectListTile.vue
rename to app/imports/ui/creature/properties/effects/EffectListTile.vue
diff --git a/app/imports/ui/components/features/FeatureCard.Story.vue b/app/imports/ui/creature/properties/features/FeatureCard.Story.vue
similarity index 90%
rename from app/imports/ui/components/features/FeatureCard.Story.vue
rename to app/imports/ui/creature/properties/features/FeatureCard.Story.vue
index f9c62874..89f60f88 100644
--- a/app/imports/ui/components/features/FeatureCard.Story.vue
+++ b/app/imports/ui/creature/properties/features/FeatureCard.Story.vue
@@ -13,7 +13,7 @@
 
 <script>
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-	import FeatureCard from '/imports/ui/components/features/FeatureCard.vue';
+	import FeatureCard from '/imports/ui/creature/properties/features/FeatureCard.vue';
 
 	export default {
 		dontWrap: true,
diff --git a/app/imports/ui/components/features/FeatureCard.vue b/app/imports/ui/creature/properties/features/FeatureCard.vue
similarity index 100%
rename from app/imports/ui/components/features/FeatureCard.vue
rename to app/imports/ui/creature/properties/features/FeatureCard.vue
diff --git a/app/imports/ui/components/features/FeatureCreationDialog.vue b/app/imports/ui/creature/properties/features/FeatureCreationDialog.vue
similarity index 91%
rename from app/imports/ui/components/features/FeatureCreationDialog.vue
rename to app/imports/ui/creature/properties/features/FeatureCreationDialog.vue
index 29d59e20..9e8c7992 100644
--- a/app/imports/ui/components/features/FeatureCreationDialog.vue
+++ b/app/imports/ui/creature/properties/features/FeatureCreationDialog.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-	import FeatureForm from '/imports/ui/components/features/FeatureForm.vue';
+	import FeatureForm from '/imports/ui/creature/properties/features/FeatureForm.vue';
 	import Features, { FeatureSchema } from '/imports/api/creature/properties/Features.js';
 	import PropertyInsertDialog from '/imports/ui/components/properties/PropertyInsertDialog.vue';
 
diff --git a/app/imports/ui/components/features/FeatureDialog.vue b/app/imports/ui/creature/properties/features/FeatureDialog.vue
similarity index 89%
rename from app/imports/ui/components/features/FeatureDialog.vue
rename to app/imports/ui/creature/properties/features/FeatureDialog.vue
index 36c4e69c..507a881d 100644
--- a/app/imports/ui/components/features/FeatureDialog.vue
+++ b/app/imports/ui/creature/properties/features/FeatureDialog.vue
@@ -14,7 +14,7 @@
 
 <script>
 	import PropertyDialog from '/imports/ui/components/properties/PropertyDialog.vue';
-	import FeatureForm from '/imports/ui/components/features/FeatureForm.vue';
+	import FeatureForm from '/imports/ui/creature/properties/features/FeatureForm.vue';
 	import MarkdownText from '/imports/ui/components/MarkdownText.vue';
 
 	export default {
diff --git a/app/imports/ui/components/features/FeatureDialogContainer.vue b/app/imports/ui/creature/properties/features/FeatureDialogContainer.vue
similarity index 90%
rename from app/imports/ui/components/features/FeatureDialogContainer.vue
rename to app/imports/ui/creature/properties/features/FeatureDialogContainer.vue
index fcbbd839..c60500f4 100644
--- a/app/imports/ui/components/features/FeatureDialogContainer.vue
+++ b/app/imports/ui/creature/properties/features/FeatureDialogContainer.vue
@@ -8,7 +8,7 @@
 
 <script>
 	import Features, {updateFeature} from '/imports/api/creature/properties/Features.js';
-	import FeatureDialog from '/imports/ui/components/features/FeatureDialog.vue';
+	import FeatureDialog from '/imports/ui/creature/properties/features/FeatureDialog.vue';
 	import {evaluateStringForCharId} from '/imports/ui/utility/evaluate.js';
 
 	export default {
diff --git a/app/imports/ui/components/features/FeatureForm.vue b/app/imports/ui/creature/properties/features/FeatureForm.vue
similarity index 100%
rename from app/imports/ui/components/features/FeatureForm.vue
rename to app/imports/ui/creature/properties/features/FeatureForm.vue
diff --git a/app/imports/ui/components/skills/SkillDialog.vue b/app/imports/ui/creature/properties/skills/SkillDialog.vue
similarity index 88%
rename from app/imports/ui/components/skills/SkillDialog.vue
rename to app/imports/ui/creature/properties/skills/SkillDialog.vue
index cd6d7ee4..5aa34b10 100644
--- a/app/imports/ui/components/skills/SkillDialog.vue
+++ b/app/imports/ui/creature/properties/skills/SkillDialog.vue
@@ -27,11 +27,11 @@
 </template>
 
 <script>
-	import EffectChildList from '/imports/ui/components/children/effects/EffectChildList.vue';
+	import EffectChildList from '/imports/ui/creature/properties/effects/EffectChildList.vue';
 	import DialogBase from "/imports/ui/dialogStack/DialogBase.vue";
-	import SkillEdit from '/imports/ui/components/skills/SkillEdit.vue';
-	import SkillProficiencyList from '/imports/ui/components/skills/SkillProficiencyList.vue';
-	import SkillListTile from '/imports/ui/components/skills/SkillListTile.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';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/components/skills/SkillDialogContainer.vue b/app/imports/ui/creature/properties/skills/SkillDialogContainer.vue
similarity index 95%
rename from app/imports/ui/components/skills/SkillDialogContainer.vue
rename to app/imports/ui/creature/properties/skills/SkillDialogContainer.vue
index 4191b710..b9f74067 100644
--- a/app/imports/ui/components/skills/SkillDialogContainer.vue
+++ b/app/imports/ui/creature/properties/skills/SkillDialogContainer.vue
@@ -10,7 +10,7 @@
 
 <script>
 
-	import SkillDialog from '/imports/ui/components/skills/SkillDialog.vue';
+	import SkillDialog from '/imports/ui/creature/properties/skills/SkillDialog.vue';
 	import Skills from '/imports/api/creature/properties/Skills.js';
 	import { updateSkill } from '/imports/api/creature/properties/Skills.js';
 	import Attributes from '/imports/api/creature/properties/Attributes.js';
diff --git a/app/imports/ui/components/skills/SkillEdit.vue b/app/imports/ui/creature/properties/skills/SkillEdit.vue
similarity index 100%
rename from app/imports/ui/components/skills/SkillEdit.vue
rename to app/imports/ui/creature/properties/skills/SkillEdit.vue
diff --git a/app/imports/ui/components/skills/SkillListTile.Story.vue b/app/imports/ui/creature/properties/skills/SkillListTile.Story.vue
similarity index 90%
rename from app/imports/ui/components/skills/SkillListTile.Story.vue
rename to app/imports/ui/creature/properties/skills/SkillListTile.Story.vue
index c48d5609..0dd2d8e4 100644
--- a/app/imports/ui/components/skills/SkillListTile.Story.vue
+++ b/app/imports/ui/creature/properties/skills/SkillListTile.Story.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-	import SkillListTile from '/imports/ui/components/skills/SkillListTile.vue';
+	import SkillListTile from '/imports/ui/creature/properties/skills/SkillListTile.vue';
 	export default {
 		data(){return {
 			skills: [
diff --git a/app/imports/ui/components/skills/SkillListTile.vue b/app/imports/ui/creature/properties/skills/SkillListTile.vue
similarity index 100%
rename from app/imports/ui/components/skills/SkillListTile.vue
rename to app/imports/ui/creature/properties/skills/SkillListTile.vue
diff --git a/app/imports/ui/components/skills/SkillProficiencyList.vue b/app/imports/ui/creature/properties/skills/SkillProficiencyList.vue
similarity index 100%
rename from app/imports/ui/components/skills/SkillProficiencyList.vue
rename to app/imports/ui/creature/properties/skills/SkillProficiencyList.vue
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
index 8c7ffe0b..be78d4e2 100644
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ b/app/imports/ui/dialogStack/DialogComponentIndex.js
@@ -1,9 +1,9 @@
-import AttributeDialog from '/imports/ui/components/attributes/AttributeDialog.vue';
-import AttributeDialogContainer from '/imports/ui/components/attributes/AttributeDialogContainer.vue';
-import AttributeCreationDialog from '/imports/ui/components/attributes/AttributeCreationDialog.vue';
-import FeatureCreationDialog from '/imports/ui/components/features/FeatureCreationDialog.vue';
-import FeatureDialogContainer from '/imports/ui/components/features/FeatureDialogContainer.vue';
-import SkillDialogContainer from '/imports/ui/components/skills/SkillDialogContainer.vue';
+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 SkillDialogContainer from '/imports/ui/creature/properties/skills/SkillDialogContainer.vue';
 
 export default {
   AttributeDialog,
diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/ui/pages/CharacterList.vue
index 82bc7b9e..2a020ad9 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/ui/pages/CharacterList.vue
@@ -77,7 +77,7 @@
   import store from "/imports/ui/vuexStore.js";
   import ToolbarLayout from "/imports/ui/layouts/ToolbarLayout.vue";
   import LabeledFab from "/imports/ui/components/LabeledFab.vue";
-  import CharacterCreationDialog from "/imports/ui/character/CharacterCreationDialog.vue";
+  import CharacterCreationDialog from "/imports/ui/creature/character/CharacterCreationDialog.vue";
 	import insertCreature from '/imports/api/creature/insertCreature.js';
 
   const characterTransform = function(char){
diff --git a/app/imports/ui/pages/CharacterSheetPage.vue b/app/imports/ui/pages/CharacterSheetPage.vue
index 9cc88b1a..5e78d8b7 100644
--- a/app/imports/ui/pages/CharacterSheetPage.vue
+++ b/app/imports/ui/pages/CharacterSheetPage.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import CharacterSheet from '/imports/ui/character/CharacterSheet.vue';
+import CharacterSheet from '/imports/ui/creature/character/CharacterSheet.vue';
 export default {
 	components: {
 		CharacterSheet,