diff --git a/app/imports/ui/StoryBook.vue b/app/imports/ui/StoryBook.vue
index fcc7ff1e..942503d0 100644
--- a/app/imports/ui/StoryBook.vue
+++ b/app/imports/ui/StoryBook.vue
@@ -39,17 +39,17 @@
 
 <script>
 	import Vue from "vue";
-	import AbilityListTile from '/imports/ui/components/AbilityListTile.Story.vue';
-	import AttributeCard from '/imports/ui/components/AttributeCard.Story.vue';
-	import AttributeEdit from '/imports/ui/components/AttributeEdit.Story.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 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 HealthBar from '/imports/ui/components/HealthBar.Story.vue';
-	import HitDiceListTile from '/imports/ui/components/HitDiceListTile.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 SmartInput from '/imports/ui/components/global/SmartInput.Story.vue';
diff --git a/app/imports/ui/character/StatsTab.vue b/app/imports/ui/character/StatsTab.vue
index 287591d8..040bf2ec 100644
--- a/app/imports/ui/character/StatsTab.vue
+++ b/app/imports/ui/character/StatsTab.vue
@@ -103,11 +103,11 @@
 <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/AttributeCard.vue';
-	import AbilityListTile from '/imports/ui/components/AbilityListTile.vue';
+	import AttributeCard from '/imports/ui/components/attributes/AttributeCard.vue';
+	import AbilityListTile from '/imports/ui/components/attributes/AbilityListTile.vue';
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-	import HealthBarCardContainer from '/imports/ui/components/HealthBarCardContainer.vue';
-	import HitDiceListTile from '/imports/ui/components/HitDiceListTile.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 { adjustAttribute, insertAttribute } from '/imports/api/creature/properties/Attributes.js';
diff --git a/app/imports/ui/components/SkillDialog.vue b/app/imports/ui/components/SkillDialog.vue
index e4145dc3..a465aea2 100644
--- a/app/imports/ui/components/SkillDialog.vue
+++ b/app/imports/ui/components/SkillDialog.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-	import AttributeEffectList from '/imports/ui/components/AttributeEffectList.vue';
+	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';
diff --git a/app/imports/ui/components/AbilityListTile.Story.vue b/app/imports/ui/components/attributes/AbilityListTile.Story.vue
similarity index 96%
rename from app/imports/ui/components/AbilityListTile.Story.vue
rename to app/imports/ui/components/attributes/AbilityListTile.Story.vue
index ebd598a5..abf5b520 100644
--- a/app/imports/ui/components/AbilityListTile.Story.vue
+++ b/app/imports/ui/components/attributes/AbilityListTile.Story.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-	import AbilityListTile from '/imports/ui/components/AbilityListTile.vue';
+	import AbilityListTile from '/imports/ui/components/attributes/AbilityListTile.vue';
 	import store from "/imports/ui/vuexStore.js";
 
 	export default {
diff --git a/app/imports/ui/components/AbilityListTile.vue b/app/imports/ui/components/attributes/AbilityListTile.vue
similarity index 100%
rename from app/imports/ui/components/AbilityListTile.vue
rename to app/imports/ui/components/attributes/AbilityListTile.vue
diff --git a/app/imports/ui/components/AttributeCard.Story.vue b/app/imports/ui/components/attributes/AttributeCard.Story.vue
similarity index 89%
rename from app/imports/ui/components/AttributeCard.Story.vue
rename to app/imports/ui/components/attributes/AttributeCard.Story.vue
index d7ecd1ba..5a215ec5 100644
--- a/app/imports/ui/components/AttributeCard.Story.vue
+++ b/app/imports/ui/components/attributes/AttributeCard.Story.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-	import AttributeCard from '/imports/ui/components/AttributeCard.vue';
+	import AttributeCard from '/imports/ui/components/attributes/AttributeCard.vue';
 	export default {
 		components: {
 			AttributeCard
diff --git a/app/imports/ui/components/AttributeCard.vue b/app/imports/ui/components/attributes/AttributeCard.vue
similarity index 100%
rename from app/imports/ui/components/AttributeCard.vue
rename to app/imports/ui/components/attributes/AttributeCard.vue
diff --git a/app/imports/ui/components/AttributeCreationDialog.vue b/app/imports/ui/components/attributes/AttributeCreationDialog.vue
similarity index 95%
rename from app/imports/ui/components/AttributeCreationDialog.vue
rename to app/imports/ui/components/attributes/AttributeCreationDialog.vue
index e031b9c9..e384226a 100644
--- a/app/imports/ui/components/AttributeCreationDialog.vue
+++ b/app/imports/ui/components/attributes/AttributeCreationDialog.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-	import AttributeEdit from '/imports/ui/components/AttributeEdit.vue';
+	import AttributeEdit from '/imports/ui/components/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/AttributeDialog.vue b/app/imports/ui/components/attributes/AttributeDialog.vue
similarity index 92%
rename from app/imports/ui/components/AttributeDialog.vue
rename to app/imports/ui/components/attributes/AttributeDialog.vue
index ee5d8023..0accca51 100644
--- a/app/imports/ui/components/AttributeDialog.vue
+++ b/app/imports/ui/components/attributes/AttributeDialog.vue
@@ -35,8 +35,8 @@
 
 <script>
 	import DialogBase from "/imports/ui/dialogStack/DialogBase.vue";
-	import AttributeEffectList from '/imports/ui/components/AttributeEffectList.vue';
-	import AttributeEdit from '/imports/ui/components/AttributeEdit.vue';
+	import AttributeEffectList from '/imports/ui/components/attributes/AttributeEffectList.vue';
+	import AttributeEdit from '/imports/ui/components/attributes/AttributeEdit.vue';
 	import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 
 	export default {
diff --git a/app/imports/ui/components/AttributeDialogContainer.vue b/app/imports/ui/components/attributes/AttributeDialogContainer.vue
similarity index 93%
rename from app/imports/ui/components/AttributeDialogContainer.vue
rename to app/imports/ui/components/attributes/AttributeDialogContainer.vue
index a2f42553..12e3ac9b 100644
--- a/app/imports/ui/components/AttributeDialogContainer.vue
+++ b/app/imports/ui/components/attributes/AttributeDialogContainer.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-	import AttributeDialog from '/imports/ui/components/AttributeDialog.vue';
+	import AttributeDialog from '/imports/ui/components/attributes/AttributeDialog.vue';
 	import Attributes from '/imports/api/creature/properties/Attributes.js';
 	import { updateAttribute, adjustAttribute } from '/imports/api/creature/properties/Attributes.js';
 	import Effects from '/imports/api/creature/properties/Effects.js';
diff --git a/app/imports/ui/components/AttributeEdit.Story.vue b/app/imports/ui/components/attributes/AttributeEdit.Story.vue
similarity index 93%
rename from app/imports/ui/components/AttributeEdit.Story.vue
rename to app/imports/ui/components/attributes/AttributeEdit.Story.vue
index 0e1a7d9b..dabdfddb 100644
--- a/app/imports/ui/components/AttributeEdit.Story.vue
+++ b/app/imports/ui/components/attributes/AttributeEdit.Story.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-	import AttributeEdit from '/imports/ui/components/AttributeEdit.vue';
+	import AttributeEdit from '/imports/ui/components/attributes/AttributeEdit.vue';
 	import debounceUpdate from '/imports/ui/utility/debounceUpdate.js';
 	export default {
 		components: {
diff --git a/app/imports/ui/components/AttributeEdit.vue b/app/imports/ui/components/attributes/AttributeEdit.vue
similarity index 100%
rename from app/imports/ui/components/AttributeEdit.vue
rename to app/imports/ui/components/attributes/AttributeEdit.vue
diff --git a/app/imports/ui/components/AttributeEffectList.vue b/app/imports/ui/components/attributes/AttributeEffectList.vue
similarity index 100%
rename from app/imports/ui/components/AttributeEffectList.vue
rename to app/imports/ui/components/attributes/AttributeEffectList.vue
diff --git a/app/imports/ui/components/HealthBar.Story.vue b/app/imports/ui/components/attributes/HealthBar.Story.vue
similarity index 93%
rename from app/imports/ui/components/HealthBar.Story.vue
rename to app/imports/ui/components/attributes/HealthBar.Story.vue
index 0d4e00bc..3ecba5db 100644
--- a/app/imports/ui/components/HealthBar.Story.vue
+++ b/app/imports/ui/components/attributes/HealthBar.Story.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-	import HealthBar from '/imports/ui/components/HealthBar.vue';
+	import HealthBar from '/imports/ui/components/attributes/HealthBar.vue';
 	export default {
 		data(){return{
 			value: 100,
diff --git a/app/imports/ui/components/HealthBar.vue b/app/imports/ui/components/attributes/HealthBar.vue
similarity index 100%
rename from app/imports/ui/components/HealthBar.vue
rename to app/imports/ui/components/attributes/HealthBar.vue
diff --git a/app/imports/ui/components/HealthBarCard.vue b/app/imports/ui/components/attributes/HealthBarCard.vue
similarity index 87%
rename from app/imports/ui/components/HealthBarCard.vue
rename to app/imports/ui/components/attributes/HealthBarCard.vue
index 4506529d..9c1f9889 100644
--- a/app/imports/ui/components/HealthBarCard.vue
+++ b/app/imports/ui/components/attributes/HealthBarCard.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-	import HealthBar from '/imports/ui/components/HealthBar.vue';
+	import HealthBar from '/imports/ui/components/attributes/HealthBar.vue';
 
 	export default {
 		props: {
diff --git a/app/imports/ui/components/HealthBarCardContainer.vue b/app/imports/ui/components/attributes/HealthBarCardContainer.vue
similarity index 91%
rename from app/imports/ui/components/HealthBarCardContainer.vue
rename to app/imports/ui/components/attributes/HealthBarCardContainer.vue
index 6591c921..423f64e4 100644
--- a/app/imports/ui/components/HealthBarCardContainer.vue
+++ b/app/imports/ui/components/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/HealthBarCard.vue';
+	import HealthBarCard from '/imports/ui/components/attributes/HealthBarCard.vue';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/components/HitDiceListTile.Story.vue b/app/imports/ui/components/attributes/HitDiceListTile.Story.vue
similarity index 92%
rename from app/imports/ui/components/HitDiceListTile.Story.vue
rename to app/imports/ui/components/attributes/HitDiceListTile.Story.vue
index af02bf9e..e82b4487 100644
--- a/app/imports/ui/components/HitDiceListTile.Story.vue
+++ b/app/imports/ui/components/attributes/HitDiceListTile.Story.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-	import HitDiceListTile from '/imports/ui/components/HitDiceListTile.vue';
+	import HitDiceListTile from '/imports/ui/components/attributes/HitDiceListTile.vue';
 	export default {
 		data(){ return{
 			hitDice: [
diff --git a/app/imports/ui/components/HitDiceListTile.vue b/app/imports/ui/components/attributes/HitDiceListTile.vue
similarity index 100%
rename from app/imports/ui/components/HitDiceListTile.vue
rename to app/imports/ui/components/attributes/HitDiceListTile.vue
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
index ee1d1411..66ab7d42 100644
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ b/app/imports/ui/dialogStack/DialogComponentIndex.js
@@ -1,6 +1,6 @@
-import AttributeDialog from '/imports/ui/components/AttributeDialog.vue';
-import AttributeDialogContainer from '/imports/ui/components/AttributeDialogContainer.vue';
-import AttributeCreationDialog from '/imports/ui/components/AttributeCreationDialog.vue';
+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';