diff --git a/app/imports/ui/StoryBook.vue b/app/imports/ui/StoryBook.vue
index 76e2b5fb..934c5232 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/properties/attributes/AbilityListTile.Story.vue';
-	import AttributeCard from '/imports/ui/properties/attributes/AttributeCard.Story.vue';
+	import AbilityListTile from '/imports/ui/properties/components/attributes/AbilityListTile.Story.vue';
+	import AttributeCard from '/imports/ui/properties/components/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/properties/viewers/shared/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 FeatureCard from '/imports/ui/properties/components/features/FeatureCard.Story.vue';
+	import HealthBar from '/imports/ui/properties/components/attributes/HealthBar.Story.vue';
+	import HitDiceListTile from '/imports/ui/properties/components/attributes/HitDiceListTile.Story.vue';
 	// import IconSearch from '/imports/ui/components/IconSearch.Story.vue';
-	import ResourceCard from '/imports/ui/properties/attributes/ResourceCard.Story.vue';
-	import SkillListTile from '/imports/ui/properties/skills/SkillListTile.Story.vue';
+	import ResourceCard from '/imports/ui/properties/components/attributes/ResourceCard.Story.vue';
+	import SkillListTile from '/imports/ui/properties/components/skills/SkillListTile.Story.vue';
 	import SmartInput from '/imports/ui/components/global/SmartInput.Story.vue';
-	import SpellSlotListTile from '/imports/ui/properties/attributes/SpellSlotListTile.Story.vue';
+	import SpellSlotListTile from '/imports/ui/properties/components/attributes/SpellSlotListTile.Story.vue';
 	import ToolbarLayout from '/imports/ui/layouts/ToolbarLayout.vue';
 
 	export default {
diff --git a/app/imports/ui/components/tree/TreeNode.vue b/app/imports/ui/components/tree/TreeNode.vue
index 909ea221..630cfa98 100644
--- a/app/imports/ui/components/tree/TreeNode.vue
+++ b/app/imports/ui/components/tree/TreeNode.vue
@@ -65,7 +65,7 @@
 	* the tree view shows off the full character structure, and where each part of
 	* character comes from.
 	**/
-	import PropertyIcon from '/imports/ui/properties/PropertyIcon.vue';
+	import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
 	import { canBeParent } from '/imports/api/parenting/parenting.js';
 	import PROPERTIES from '/imports/constants/PROPERTIES.js'
 
diff --git a/app/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue b/app/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue
index 6643201f..79867684 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue
@@ -18,7 +18,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/properties/features/FeatureCard.vue';
+	import FeatureCard from '/imports/ui/properties/components/features/FeatureCard.vue';
 	import { evaluateComputation, evaluateStringWithVariables } from '/imports/ui/utility/evaluate.js';
 
 	export default {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index ede09229..f20a2a62 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -129,14 +129,14 @@
 
 <script>
 	import CreatureProperties, { damageProperty } from '/imports/api/creature/CreatureProperties.js';
-	import AttributeCard from '/imports/ui/properties/attributes/AttributeCard.vue';
-	import AbilityListTile from '/imports/ui/properties/attributes/AbilityListTile.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 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 HealthBarCardContainer from '/imports/ui/properties/components/attributes/HealthBarCardContainer.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';
 
 	let adjustAttribute = insertAttribute = () => console.error("this shit isn't defined");
 
diff --git a/app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue b/app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue
index df71f65a..475f7db4 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue
@@ -84,9 +84,9 @@
 		insertProperty,
 		insertPropertyFromLibraryNode
 	} from '/imports/api/creature/CreatureProperties.js';
-	import PropertyViewer from '/imports/ui/properties/PropertyViewer.vue';
+	import PropertyViewer from '/imports/ui/properties/shared/PropertyViewer.vue';
 	import { setDocToLastOrder } from '/imports/api/parenting/order.js';
-	import PropertyIcon from '/imports/ui/properties/PropertyIcon.vue';
+	import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
 	import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 
 	export default {
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue b/app/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
index cc5e720a..3359c841 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
+++ b/app/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import SelectablePropertyDialog from '/imports/ui/properties/components/SelectablePropertyDialog.vue';
+import SelectablePropertyDialog from '/imports/ui/properties/shared/SelectablePropertyDialog.vue';
 import CreaturePropertyInsertForm from '/imports/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue b/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
index 549198bc..cd31564d 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
+++ b/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
@@ -67,7 +67,7 @@ import CreatureProperties, {
 } from '/imports/api/creature/CreatureProperties.js';
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import PropertyIcon from '/imports/ui/properties/PropertyIcon.vue';
+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';
 
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
index 47dd3ce5..72861f2b 100644
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ b/app/imports/ui/dialogStack/DialogComponentIndex.js
@@ -1,19 +1,19 @@
-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 AttributeDialog from '/imports/ui/properties/components/attributes/AttributeDialog.vue';
+import AttributeDialogContainer from '/imports/ui/properties/components/attributes/AttributeDialogContainer.vue';
+import AttributeCreationDialog from '/imports/ui/properties/components/attributes/AttributeCreationDialog.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 DeleteConfirmationDialog from '/imports/ui/dialogStack/DeleteConfirmationDialog.vue';
-import FeatureCreationDialog from '/imports/ui/properties/features/FeatureCreationDialog.vue';
-import FeatureDialogContainer from '/imports/ui/properties/features/FeatureDialogContainer.vue';
+import FeatureCreationDialog from '/imports/ui/properties/components/features/FeatureCreationDialog.vue';
+import FeatureDialogContainer from '/imports/ui/properties/components/features/FeatureDialogContainer.vue';
 import LibraryCreationDialog from '/imports/ui/library/LibraryCreationDialog.vue';
 import LibraryEditDialog from '/imports/ui/library/LibraryEditDialog.vue';
 import LibraryNodeCreationDialog from '/imports/ui/library/LibraryNodeCreationDialog.vue';
 import LibraryNodeEditDialog from '/imports/ui/library/LibraryNodeEditDialog.vue';
 import ShareDialog from '/imports/ui/sharing/ShareDialog.vue';
-import SkillDialogContainer from '/imports/ui/properties/skills/SkillDialogContainer.vue';
+import SkillDialogContainer from '/imports/ui/properties/components/skills/SkillDialogContainer.vue';
 
 export default {
   AttributeDialog,
diff --git a/app/imports/ui/library/LibraryAndNode.vue b/app/imports/ui/library/LibraryAndNode.vue
index 360030a1..4866dc99 100644
--- a/app/imports/ui/library/LibraryAndNode.vue
+++ b/app/imports/ui/library/LibraryAndNode.vue
@@ -47,10 +47,10 @@
 <script>
 import ToolbarLayout from '/imports/ui/layouts/ToolbarLayout.vue';
 import LibraryBrowser from '/imports/ui/library/LibraryBrowser.vue';
-import PropertyViewer from '/imports/ui/properties/PropertyViewer.vue';
+import PropertyViewer from '/imports/ui/properties/shared/PropertyViewer.vue';
 import LibraryNodes, { insertNode } from '/imports/api/library/LibraryNodes.js';
 import Libraries from '/imports/api/library/Libraries.js';
-import PropertyIcon from '/imports/ui/properties/PropertyIcon.vue';
+import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/library/LibraryNodeCreationDialog.vue b/app/imports/ui/library/LibraryNodeCreationDialog.vue
index 055637b4..2dd86efd 100644
--- a/app/imports/ui/library/LibraryNodeCreationDialog.vue
+++ b/app/imports/ui/library/LibraryNodeCreationDialog.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import SelectablePropertyDialog from '/imports/ui/properties/components/SelectablePropertyDialog.vue';
+import SelectablePropertyDialog from '/imports/ui/properties/shared/SelectablePropertyDialog.vue';
 import LibraryNodeInsertForm from '/imports/ui/library/LibraryNodeInsertForm.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 
diff --git a/app/imports/ui/library/LibraryNodeEditDialog.vue b/app/imports/ui/library/LibraryNodeEditDialog.vue
index e1ae8124..1e083a27 100644
--- a/app/imports/ui/library/LibraryNodeEditDialog.vue
+++ b/app/imports/ui/library/LibraryNodeEditDialog.vue
@@ -41,7 +41,7 @@
 	} from '/imports/api/library/LibraryNodes.js';
 	import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
 	import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-	import PropertyIcon from '/imports/ui/properties/PropertyIcon.vue';
+	import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
 	import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
 	import { get } from 'lodash';
 
diff --git a/app/imports/ui/properties/attributes/AbilityListTile.Story.vue b/app/imports/ui/properties/components/attributes/AbilityListTile.Story.vue
similarity index 95%
rename from app/imports/ui/properties/attributes/AbilityListTile.Story.vue
rename to app/imports/ui/properties/components/attributes/AbilityListTile.Story.vue
index cfbf312e..a8935611 100644
--- a/app/imports/ui/properties/attributes/AbilityListTile.Story.vue
+++ b/app/imports/ui/properties/components/attributes/AbilityListTile.Story.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-	import AbilityListTile from '/imports/ui/properties/attributes/AbilityListTile.vue';
+	import AbilityListTile from '/imports/ui/properties/components/attributes/AbilityListTile.vue';
 	import store from "/imports/ui/vuexStore.js";
 
 	export default {
diff --git a/app/imports/ui/properties/attributes/AbilityListTile.vue b/app/imports/ui/properties/components/attributes/AbilityListTile.vue
similarity index 100%
rename from app/imports/ui/properties/attributes/AbilityListTile.vue
rename to app/imports/ui/properties/components/attributes/AbilityListTile.vue
diff --git a/app/imports/ui/properties/attributes/AttributeCard.Story.vue b/app/imports/ui/properties/components/attributes/AttributeCard.Story.vue
similarity index 88%
rename from app/imports/ui/properties/attributes/AttributeCard.Story.vue
rename to app/imports/ui/properties/components/attributes/AttributeCard.Story.vue
index d80cf0e5..c31231fd 100644
--- a/app/imports/ui/properties/attributes/AttributeCard.Story.vue
+++ b/app/imports/ui/properties/components/attributes/AttributeCard.Story.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-	import AttributeCard from '/imports/ui/properties/attributes/AttributeCard.vue';
+	import AttributeCard from '/imports/ui/properties/components/attributes/AttributeCard.vue';
 	export default {
 		components: {
 			AttributeCard
diff --git a/app/imports/ui/properties/attributes/AttributeCard.vue b/app/imports/ui/properties/components/attributes/AttributeCard.vue
similarity index 100%
rename from app/imports/ui/properties/attributes/AttributeCard.vue
rename to app/imports/ui/properties/components/attributes/AttributeCard.vue
diff --git a/app/imports/ui/properties/attributes/AttributeCreationDialog.vue b/app/imports/ui/properties/components/attributes/AttributeCreationDialog.vue
similarity index 100%
rename from app/imports/ui/properties/attributes/AttributeCreationDialog.vue
rename to app/imports/ui/properties/components/attributes/AttributeCreationDialog.vue
diff --git a/app/imports/ui/properties/attributes/AttributeDialog.vue b/app/imports/ui/properties/components/attributes/AttributeDialog.vue
similarity index 100%
rename from app/imports/ui/properties/attributes/AttributeDialog.vue
rename to app/imports/ui/properties/components/attributes/AttributeDialog.vue
diff --git a/app/imports/ui/properties/attributes/AttributeDialogContainer.vue b/app/imports/ui/properties/components/attributes/AttributeDialogContainer.vue
similarity index 91%
rename from app/imports/ui/properties/attributes/AttributeDialogContainer.vue
rename to app/imports/ui/properties/components/attributes/AttributeDialogContainer.vue
index ebc5bbdc..ace4203d 100644
--- a/app/imports/ui/properties/attributes/AttributeDialogContainer.vue
+++ b/app/imports/ui/properties/components/attributes/AttributeDialogContainer.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-	import AttributeDialog from '/imports/ui/properties/attributes/AttributeDialog.vue';
+	import AttributeDialog from '/imports/ui/properties/components/attributes/AttributeDialog.vue';
 	import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
 
 	export default {
diff --git a/app/imports/ui/properties/attributes/HealthBar.Story.vue b/app/imports/ui/properties/components/attributes/HealthBar.Story.vue
similarity index 92%
rename from app/imports/ui/properties/attributes/HealthBar.Story.vue
rename to app/imports/ui/properties/components/attributes/HealthBar.Story.vue
index 5af29abf..7d0ab79d 100644
--- a/app/imports/ui/properties/attributes/HealthBar.Story.vue
+++ b/app/imports/ui/properties/components/attributes/HealthBar.Story.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-	import HealthBar from '/imports/ui/properties/attributes/HealthBar.vue';
+	import HealthBar from '/imports/ui/properties/components/attributes/HealthBar.vue';
 	export default {
 		data(){return{
 			value: 100,
diff --git a/app/imports/ui/properties/attributes/HealthBar.vue b/app/imports/ui/properties/components/attributes/HealthBar.vue
similarity index 100%
rename from app/imports/ui/properties/attributes/HealthBar.vue
rename to app/imports/ui/properties/components/attributes/HealthBar.vue
diff --git a/app/imports/ui/properties/attributes/HealthBarCard.vue b/app/imports/ui/properties/components/attributes/HealthBarCard.vue
similarity index 85%
rename from app/imports/ui/properties/attributes/HealthBarCard.vue
rename to app/imports/ui/properties/components/attributes/HealthBarCard.vue
index accc3861..dbec9518 100644
--- a/app/imports/ui/properties/attributes/HealthBarCard.vue
+++ b/app/imports/ui/properties/components/attributes/HealthBarCard.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-	import HealthBar from '/imports/ui/properties/attributes/HealthBar.vue';
+	import HealthBar from '/imports/ui/properties/components/attributes/HealthBar.vue';
 
 	export default {
 		props: {
diff --git a/app/imports/ui/properties/attributes/HealthBarCardContainer.vue b/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
similarity index 90%
rename from app/imports/ui/properties/attributes/HealthBarCardContainer.vue
rename to app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
index 2992a137..ebd74446 100644
--- a/app/imports/ui/properties/attributes/HealthBarCardContainer.vue
+++ b/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
@@ -8,7 +8,7 @@
 
 <script>
 	import CreatureProperties, { damageProperty } from '/imports/api/creature/CreatureProperties.js';
-	import HealthBarCard from '/imports/ui/properties/attributes/HealthBarCard.vue';
+	import HealthBarCard from '/imports/ui/properties/components/attributes/HealthBarCard.vue';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/properties/attributes/HitDiceListTile.Story.vue b/app/imports/ui/properties/components/attributes/HitDiceListTile.Story.vue
similarity index 91%
rename from app/imports/ui/properties/attributes/HitDiceListTile.Story.vue
rename to app/imports/ui/properties/components/attributes/HitDiceListTile.Story.vue
index 351af2e9..8a3e062a 100644
--- a/app/imports/ui/properties/attributes/HitDiceListTile.Story.vue
+++ b/app/imports/ui/properties/components/attributes/HitDiceListTile.Story.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-	import HitDiceListTile from '/imports/ui/properties/attributes/HitDiceListTile.vue';
+	import HitDiceListTile from '/imports/ui/properties/components/attributes/HitDiceListTile.vue';
 	export default {
 		data(){ return{
 			hitDice: [
diff --git a/app/imports/ui/properties/attributes/HitDiceListTile.vue b/app/imports/ui/properties/components/attributes/HitDiceListTile.vue
similarity index 100%
rename from app/imports/ui/properties/attributes/HitDiceListTile.vue
rename to app/imports/ui/properties/components/attributes/HitDiceListTile.vue
diff --git a/app/imports/ui/properties/attributes/ResourceCard.Story.vue b/app/imports/ui/properties/components/attributes/ResourceCard.Story.vue
similarity index 88%
rename from app/imports/ui/properties/attributes/ResourceCard.Story.vue
rename to app/imports/ui/properties/components/attributes/ResourceCard.Story.vue
index 7576ba61..8e43a9b8 100644
--- a/app/imports/ui/properties/attributes/ResourceCard.Story.vue
+++ b/app/imports/ui/properties/components/attributes/ResourceCard.Story.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-	import ResourceCard from '/imports/ui/properties/attributes/ResourceCard.vue';
+	import ResourceCard from '/imports/ui/properties/components/attributes/ResourceCard.vue';
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
 
 	export default {
diff --git a/app/imports/ui/properties/attributes/ResourceCard.vue b/app/imports/ui/properties/components/attributes/ResourceCard.vue
similarity index 100%
rename from app/imports/ui/properties/attributes/ResourceCard.vue
rename to app/imports/ui/properties/components/attributes/ResourceCard.vue
diff --git a/app/imports/ui/properties/attributes/SpellSlotListTile.Story.vue b/app/imports/ui/properties/components/attributes/SpellSlotListTile.Story.vue
similarity index 86%
rename from app/imports/ui/properties/attributes/SpellSlotListTile.Story.vue
rename to app/imports/ui/properties/components/attributes/SpellSlotListTile.Story.vue
index 90c982bb..9130c519 100644
--- a/app/imports/ui/properties/attributes/SpellSlotListTile.Story.vue
+++ b/app/imports/ui/properties/components/attributes/SpellSlotListTile.Story.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-	import SpellSlotListTile from '/imports/ui/properties/attributes/SpellSlotListTile.vue';
+	import SpellSlotListTile from '/imports/ui/properties/components/attributes/SpellSlotListTile.vue';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/properties/attributes/SpellSlotListTile.vue b/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue
similarity index 100%
rename from app/imports/ui/properties/attributes/SpellSlotListTile.vue
rename to app/imports/ui/properties/components/attributes/SpellSlotListTile.vue
diff --git a/app/imports/ui/properties/features/FeatureCard.Story.vue b/app/imports/ui/properties/components/features/FeatureCard.Story.vue
similarity index 89%
rename from app/imports/ui/properties/features/FeatureCard.Story.vue
rename to app/imports/ui/properties/components/features/FeatureCard.Story.vue
index e021a100..bf8f8308 100644
--- a/app/imports/ui/properties/features/FeatureCard.Story.vue
+++ b/app/imports/ui/properties/components/features/FeatureCard.Story.vue
@@ -13,7 +13,7 @@
 
 <script>
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-	import FeatureCard from '/imports/ui/properties/features/FeatureCard.vue';
+	import FeatureCard from '/imports/ui/properties/components/features/FeatureCard.vue';
 
 	export default {
 		dontWrap: true,
diff --git a/app/imports/ui/properties/features/FeatureCard.vue b/app/imports/ui/properties/components/features/FeatureCard.vue
similarity index 100%
rename from app/imports/ui/properties/features/FeatureCard.vue
rename to app/imports/ui/properties/components/features/FeatureCard.vue
diff --git a/app/imports/ui/properties/features/FeatureCreationDialog.vue b/app/imports/ui/properties/components/features/FeatureCreationDialog.vue
similarity index 100%
rename from app/imports/ui/properties/features/FeatureCreationDialog.vue
rename to app/imports/ui/properties/components/features/FeatureCreationDialog.vue
diff --git a/app/imports/ui/properties/features/FeatureDialog.vue b/app/imports/ui/properties/components/features/FeatureDialog.vue
similarity index 100%
rename from app/imports/ui/properties/features/FeatureDialog.vue
rename to app/imports/ui/properties/components/features/FeatureDialog.vue
diff --git a/app/imports/ui/properties/features/FeatureDialogContainer.vue b/app/imports/ui/properties/components/features/FeatureDialogContainer.vue
similarity index 89%
rename from app/imports/ui/properties/features/FeatureDialogContainer.vue
rename to app/imports/ui/properties/components/features/FeatureDialogContainer.vue
index 8f44af44..b6a0e8a9 100644
--- a/app/imports/ui/properties/features/FeatureDialogContainer.vue
+++ b/app/imports/ui/properties/components/features/FeatureDialogContainer.vue
@@ -8,7 +8,7 @@
 
 <script>
 	import Features, {updateFeature} from '/imports/api/properties/Features.js';
-	import FeatureDialog from '/imports/ui/properties/features/FeatureDialog.vue';
+	import FeatureDialog from '/imports/ui/properties/components/features/FeatureDialog.vue';
 	import {evaluateStringForCharId} from '/imports/ui/utility/evaluate.js';
 
 	export default {
diff --git a/app/imports/ui/properties/skills/SkillDialog.vue b/app/imports/ui/properties/components/skills/SkillDialog.vue
similarity index 90%
rename from app/imports/ui/properties/skills/SkillDialog.vue
rename to app/imports/ui/properties/components/skills/SkillDialog.vue
index b50bcaa9..6de04094 100644
--- a/app/imports/ui/properties/skills/SkillDialog.vue
+++ b/app/imports/ui/properties/components/skills/SkillDialog.vue
@@ -29,9 +29,9 @@
 <script>
 	import EffectChildList from '/imports/ui/properties/viewers/shared/effects/EffectChildList.vue';
 	import DialogBase from "/imports/ui/dialogStack/DialogBase.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';
+	import SkillEdit from '/imports/ui/properties/components/skills/SkillEdit.vue';
+	import SkillProficiencyList from '/imports/ui/properties/components/skills/SkillProficiencyList.vue';
+	import SkillListTile from '/imports/ui/properties/components/skills/SkillListTile.vue';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/properties/skills/SkillDialogContainer.vue b/app/imports/ui/properties/components/skills/SkillDialogContainer.vue
similarity index 94%
rename from app/imports/ui/properties/skills/SkillDialogContainer.vue
rename to app/imports/ui/properties/components/skills/SkillDialogContainer.vue
index 445f7227..81aa5ad7 100644
--- a/app/imports/ui/properties/skills/SkillDialogContainer.vue
+++ b/app/imports/ui/properties/components/skills/SkillDialogContainer.vue
@@ -10,7 +10,7 @@
 
 <script>
 
-	import SkillDialog from '/imports/ui/properties/skills/SkillDialog.vue';
+	import SkillDialog from '/imports/ui/properties/components/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/properties/skills/SkillEdit.vue b/app/imports/ui/properties/components/skills/SkillEdit.vue
similarity index 100%
rename from app/imports/ui/properties/skills/SkillEdit.vue
rename to app/imports/ui/properties/components/skills/SkillEdit.vue
diff --git a/app/imports/ui/properties/skills/SkillListTile.Story.vue b/app/imports/ui/properties/components/skills/SkillListTile.Story.vue
similarity index 89%
rename from app/imports/ui/properties/skills/SkillListTile.Story.vue
rename to app/imports/ui/properties/components/skills/SkillListTile.Story.vue
index 632f7886..e068a6ef 100644
--- a/app/imports/ui/properties/skills/SkillListTile.Story.vue
+++ b/app/imports/ui/properties/components/skills/SkillListTile.Story.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-	import SkillListTile from '/imports/ui/properties/skills/SkillListTile.vue';
+	import SkillListTile from '/imports/ui/properties/components/skills/SkillListTile.vue';
 	export default {
 		data(){return {
 			skills: [
diff --git a/app/imports/ui/properties/skills/SkillListTile.vue b/app/imports/ui/properties/components/skills/SkillListTile.vue
similarity index 100%
rename from app/imports/ui/properties/skills/SkillListTile.vue
rename to app/imports/ui/properties/components/skills/SkillListTile.vue
diff --git a/app/imports/ui/properties/skills/SkillProficiencyList.vue b/app/imports/ui/properties/components/skills/SkillProficiencyList.vue
similarity index 100%
rename from app/imports/ui/properties/skills/SkillProficiencyList.vue
rename to app/imports/ui/properties/components/skills/SkillProficiencyList.vue
diff --git a/app/imports/ui/properties/components/ProficiencyIcon.vue b/app/imports/ui/properties/shared/ProficiencyIcon.vue
similarity index 100%
rename from app/imports/ui/properties/components/ProficiencyIcon.vue
rename to app/imports/ui/properties/shared/ProficiencyIcon.vue
diff --git a/app/imports/ui/properties/PropertyIcon.vue b/app/imports/ui/properties/shared/PropertyIcon.vue
similarity index 100%
rename from app/imports/ui/properties/PropertyIcon.vue
rename to app/imports/ui/properties/shared/PropertyIcon.vue
diff --git a/app/imports/ui/properties/PropertySelector.vue b/app/imports/ui/properties/shared/PropertySelector.vue
similarity index 100%
rename from app/imports/ui/properties/PropertySelector.vue
rename to app/imports/ui/properties/shared/PropertySelector.vue
diff --git a/app/imports/ui/properties/PropertyViewer.vue b/app/imports/ui/properties/shared/PropertyViewer.vue
similarity index 100%
rename from app/imports/ui/properties/PropertyViewer.vue
rename to app/imports/ui/properties/shared/PropertyViewer.vue
diff --git a/app/imports/ui/properties/components/SelectablePropertyDialog.vue b/app/imports/ui/properties/shared/SelectablePropertyDialog.vue
similarity index 92%
rename from app/imports/ui/properties/components/SelectablePropertyDialog.vue
rename to app/imports/ui/properties/shared/SelectablePropertyDialog.vue
index 29bdfb7b..011c6555 100644
--- a/app/imports/ui/properties/components/SelectablePropertyDialog.vue
+++ b/app/imports/ui/properties/shared/SelectablePropertyDialog.vue
@@ -17,7 +17,7 @@
 
 <script>
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import PropertySelector from '/imports/ui/properties/PropertySelector.vue';
+import PropertySelector from '/imports/ui/properties/shared/PropertySelector.vue';
 
 export default {
 	props: {
diff --git a/app/imports/ui/properties/viewers/BuffViewer.vue b/app/imports/ui/properties/viewers/BuffViewer.vue
index 1d682b22..5245cc67 100644
--- a/app/imports/ui/properties/viewers/BuffViewer.vue
+++ b/app/imports/ui/properties/viewers/BuffViewer.vue
@@ -33,7 +33,7 @@
 	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
 	import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 	import EffectViewer from '/imports/ui/properties/viewers/EffectViewer.vue';
-	import PropertyIcon from '/imports/ui/properties/PropertyIcon.vue';
+	import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
 
 	export default {
 		mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/ProficiencyViewer.vue b/app/imports/ui/properties/viewers/ProficiencyViewer.vue
index e6d7f36c..87a12a2e 100644
--- a/app/imports/ui/properties/viewers/ProficiencyViewer.vue
+++ b/app/imports/ui/properties/viewers/ProficiencyViewer.vue
@@ -12,7 +12,7 @@
 
 <script>
 import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
-import ProficiencyIcon from '/imports/ui/properties/components/ProficiencyIcon.vue';
+import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
 export default {
 	mixins: [propertyViewerMixin],
 	components: {