diff --git a/app/imports/ui/StoryBook.vue b/app/imports/ui/StoryBook.vue
index 942503d0..b2882c0c 100644
--- a/app/imports/ui/StoryBook.vue
+++ b/app/imports/ui/StoryBook.vue
@@ -45,13 +45,13 @@
 	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/EffectEdit.Story.vue';
-	import EffectEditExpansionList from '/imports/ui/components/EffectEditExpansionList.Story.vue';
-	import FeatureCard from '/imports/ui/components/FeatureCard.Story.vue';
+	import EffectEdit from '/imports/ui/components/effects/EffectEdit.Story.vue';
+	import EffectEditExpansionList from '/imports/ui/components/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 IconSearch from '/imports/ui/components/IconSearch.Story.vue';
-	import SkillListTile from '/imports/ui/components/SkillListTile.Story.vue';
+	import SkillListTile from '/imports/ui/components/skills/SkillListTile.Story.vue';
 	import SmartInput from '/imports/ui/components/global/SmartInput.Story.vue';
 	import ToolbarLayout from '/imports/ui/layouts/ToolbarLayout.vue';
 
diff --git a/app/imports/ui/character/FeaturesTab.vue b/app/imports/ui/character/FeaturesTab.vue
index e4be1597..f05ca9f3 100644
--- a/app/imports/ui/character/FeaturesTab.vue
+++ b/app/imports/ui/character/FeaturesTab.vue
@@ -24,7 +24,7 @@
 	import Features 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/FeatureCard.vue';
+	import FeatureCard from '/imports/ui/components/features/FeatureCard.vue';
 	import { evaluateComputation, evaluateString } from '/imports/ui/utility/evaluate.js';
 
 	export default {
diff --git a/app/imports/ui/character/StatsTab.vue b/app/imports/ui/character/StatsTab.vue
index 040bf2ec..46523b15 100644
--- a/app/imports/ui/character/StatsTab.vue
+++ b/app/imports/ui/character/StatsTab.vue
@@ -108,7 +108,7 @@
 	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/SkillListTile.vue';
+	import SkillListTile from '/imports/ui/components/skills/SkillListTile.vue';
 
 	import { adjustAttribute, insertAttribute } from '/imports/api/creature/properties/Attributes.js';
 
diff --git a/app/imports/ui/components/attributes/AttributeEffectList.vue b/app/imports/ui/components/attributes/AttributeEffectList.vue
index 4f822902..f378d249 100644
--- a/app/imports/ui/components/attributes/AttributeEffectList.vue
+++ b/app/imports/ui/components/attributes/AttributeEffectList.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-	import EffectListTile from '/imports/ui/components/EffectListTile.vue';
+	import EffectListTile from '/imports/ui/components/effects/EffectListTile.vue';
 	const SORT_INDEX = {
 		"base": 1,
 		"add": 2,
diff --git a/app/imports/ui/components/EffectEdit.Story.vue b/app/imports/ui/components/effects/EffectEdit.Story.vue
similarity index 92%
rename from app/imports/ui/components/EffectEdit.Story.vue
rename to app/imports/ui/components/effects/EffectEdit.Story.vue
index 4d218773..a92f6e16 100644
--- a/app/imports/ui/components/EffectEdit.Story.vue
+++ b/app/imports/ui/components/effects/EffectEdit.Story.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import EffectEdit from '/imports/ui/components/EffectEdit.vue';
+import EffectEdit from '/imports/ui/components/effects/EffectEdit.vue';
 export default {
 	data(){ return {
 		effects: [
diff --git a/app/imports/ui/components/EffectEdit.vue b/app/imports/ui/components/effects/EffectEdit.vue
similarity index 100%
rename from app/imports/ui/components/EffectEdit.vue
rename to app/imports/ui/components/effects/EffectEdit.vue
diff --git a/app/imports/ui/components/EffectEditExpansionList.Story.vue b/app/imports/ui/components/effects/EffectEditExpansionList.Story.vue
similarity index 95%
rename from app/imports/ui/components/EffectEditExpansionList.Story.vue
rename to app/imports/ui/components/effects/EffectEditExpansionList.Story.vue
index 78b5638a..1f8a510e 100644
--- a/app/imports/ui/components/EffectEditExpansionList.Story.vue
+++ b/app/imports/ui/components/effects/EffectEditExpansionList.Story.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import EffectEditExpansionList from '/imports/ui/components/EffectEditExpansionList.vue';
+import EffectEditExpansionList from '/imports/ui/components/effects/EffectEditExpansionList.vue';
 export default {
 	data(){ return {
 		effects: [
diff --git a/app/imports/ui/components/EffectEditExpansionList.vue b/app/imports/ui/components/effects/EffectEditExpansionList.vue
similarity index 86%
rename from app/imports/ui/components/EffectEditExpansionList.vue
rename to app/imports/ui/components/effects/EffectEditExpansionList.vue
index 99e22583..b2af4eb7 100644
--- a/app/imports/ui/components/EffectEditExpansionList.vue
+++ b/app/imports/ui/components/effects/EffectEditExpansionList.vue
@@ -24,8 +24,8 @@
 </template>
 
 <script>
-	import EffectEdit from '/imports/ui/components/EffectEdit.vue';
-	import EffectListTile from '/imports/ui/components/EffectListTile.vue';
+	import EffectEdit from '/imports/ui/components/effects/EffectEdit.vue';
+	import EffectListTile from '/imports/ui/components/effects/EffectListTile.vue';
 	export default {
 		props: {
 			effects: Array,
diff --git a/app/imports/ui/components/EffectListTile.vue b/app/imports/ui/components/effects/EffectListTile.vue
similarity index 100%
rename from app/imports/ui/components/EffectListTile.vue
rename to app/imports/ui/components/effects/EffectListTile.vue
diff --git a/app/imports/ui/components/FeatureCard.Story.vue b/app/imports/ui/components/features/FeatureCard.Story.vue
similarity index 91%
rename from app/imports/ui/components/FeatureCard.Story.vue
rename to app/imports/ui/components/features/FeatureCard.Story.vue
index 3103e82b..f9c62874 100644
--- a/app/imports/ui/components/FeatureCard.Story.vue
+++ b/app/imports/ui/components/features/FeatureCard.Story.vue
@@ -13,7 +13,7 @@
 
 <script>
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-	import FeatureCard from '/imports/ui/components/FeatureCard.vue';
+	import FeatureCard from '/imports/ui/components/features/FeatureCard.vue';
 
 	export default {
 		dontWrap: true,
diff --git a/app/imports/ui/components/FeatureCard.vue b/app/imports/ui/components/features/FeatureCard.vue
similarity index 100%
rename from app/imports/ui/components/FeatureCard.vue
rename to app/imports/ui/components/features/FeatureCard.vue
diff --git a/app/imports/ui/components/FeatureCreationDialog.vue b/app/imports/ui/components/features/FeatureCreationDialog.vue
similarity index 95%
rename from app/imports/ui/components/FeatureCreationDialog.vue
rename to app/imports/ui/components/features/FeatureCreationDialog.vue
index 1220a9e2..bfa31879 100644
--- a/app/imports/ui/components/FeatureCreationDialog.vue
+++ b/app/imports/ui/components/features/FeatureCreationDialog.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-	import FeatureEdit from '/imports/ui/components/FeatureEdit.vue';
+	import FeatureEdit from '/imports/ui/components/features/FeatureEdit.vue';
 	import Features from '/imports/api/creature/properties/Features.js';
 	import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
 
diff --git a/app/imports/ui/components/FeatureEdit.vue b/app/imports/ui/components/features/FeatureEdit.vue
similarity index 100%
rename from app/imports/ui/components/FeatureEdit.vue
rename to app/imports/ui/components/features/FeatureEdit.vue
diff --git a/app/imports/ui/components/SkillDialog.vue b/app/imports/ui/components/skills/SkillDialog.vue
similarity index 91%
rename from app/imports/ui/components/SkillDialog.vue
rename to app/imports/ui/components/skills/SkillDialog.vue
index a465aea2..9891f7d3 100644
--- a/app/imports/ui/components/SkillDialog.vue
+++ b/app/imports/ui/components/skills/SkillDialog.vue
@@ -29,9 +29,9 @@
 <script>
 	import AttributeEffectList from '/imports/ui/components/attributes/AttributeEffectList.vue';
 	import DialogBase from "/imports/ui/dialogStack/DialogBase.vue";
-	import SkillEdit from '/imports/ui/components/SkillEdit.vue';
-	import SkillProficiencyList from '/imports/ui/components/SkillProficiencyList.vue';
-	import SkillListTile from '/imports/ui/components/SkillListTile.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';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/components/SkillDialogContainer.vue b/app/imports/ui/components/skills/SkillDialogContainer.vue
similarity index 95%
rename from app/imports/ui/components/SkillDialogContainer.vue
rename to app/imports/ui/components/skills/SkillDialogContainer.vue
index 693b6ca3..4191b710 100644
--- a/app/imports/ui/components/SkillDialogContainer.vue
+++ b/app/imports/ui/components/skills/SkillDialogContainer.vue
@@ -10,7 +10,7 @@
 
 <script>
 
-	import SkillDialog from '/imports/ui/components/SkillDialog.vue';
+	import SkillDialog from '/imports/ui/components/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/SkillEdit.vue b/app/imports/ui/components/skills/SkillEdit.vue
similarity index 100%
rename from app/imports/ui/components/SkillEdit.vue
rename to app/imports/ui/components/skills/SkillEdit.vue
diff --git a/app/imports/ui/components/SkillListTile.Story.vue b/app/imports/ui/components/skills/SkillListTile.Story.vue
similarity index 91%
rename from app/imports/ui/components/SkillListTile.Story.vue
rename to app/imports/ui/components/skills/SkillListTile.Story.vue
index 2ad35dba..c48d5609 100644
--- a/app/imports/ui/components/SkillListTile.Story.vue
+++ b/app/imports/ui/components/skills/SkillListTile.Story.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-	import SkillListTile from '/imports/ui/components/SkillListTile.vue';
+	import SkillListTile from '/imports/ui/components/skills/SkillListTile.vue';
 	export default {
 		data(){return {
 			skills: [
diff --git a/app/imports/ui/components/SkillListTile.vue b/app/imports/ui/components/skills/SkillListTile.vue
similarity index 100%
rename from app/imports/ui/components/SkillListTile.vue
rename to app/imports/ui/components/skills/SkillListTile.vue
diff --git a/app/imports/ui/components/SkillProficiencyList.vue b/app/imports/ui/components/skills/SkillProficiencyList.vue
similarity index 100%
rename from app/imports/ui/components/SkillProficiencyList.vue
rename to app/imports/ui/components/skills/SkillProficiencyList.vue
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
index 66ab7d42..cc8f3215 100644
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ b/app/imports/ui/dialogStack/DialogComponentIndex.js
@@ -1,8 +1,8 @@
 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/FeatureCreationDialog.vue';
-import SkillDialogContainer from '/imports/ui/components/SkillDialogContainer.vue';
+import FeatureCreationDialog from '/imports/ui/components/features/FeatureCreationDialog.vue';
+import SkillDialogContainer from '/imports/ui/components/skills/SkillDialogContainer.vue';
 
 export default {
   AttributeDialog,