diff --git a/app/imports/api/creature/creatureCollections.js b/app/imports/api/creature/creatureCollections.js
index 473fc66c..1c07dedf 100644
--- a/app/imports/api/creature/creatureCollections.js
+++ b/app/imports/api/creature/creatureCollections.js
@@ -1,21 +1,21 @@
-import Actions from '/imports/api/creature/properties/Actions.js';
-import Attributes from '/imports/api/creature/properties/Attributes.js';
-import Buffs from '/imports/api/creature/properties/Buffs.js';
-import Classes from '/imports/api/creature/properties/Classes.js';
-import ClassLevels from '/imports/api/creature/properties/ClassLevels.js';
-import DamageMultipliers from '/imports/api/creature/properties/DamageMultipliers.js';
-import Effects from '/imports/api/creature/properties/Effects.js';
-import Experiences from '/imports/api/creature/properties/Experiences.js';
-import Features from '/imports/api/creature/properties/Features.js';
-import Folders from '/imports/api/creature/properties/Folders.js';
-import Notes from '/imports/api/creature/properties/Notes.js';
-import Proficiencies from '/imports/api/creature/properties/Proficiencies.js';
-import Rolls from '/imports/api/creature/properties/Rolls.js';
-import Skills from '/imports/api/creature/properties/Skills.js';
-import SpellLists from '/imports/api/creature/properties/SpellLists.js';
-import Spells from '/imports/api/creature/properties/Spells.js';
-import Containers from '/imports/api/creature/properties/inventory/Containers.js';
-import Items from '/imports/api/creature/properties/inventory/Items.js';
+import Actions from '/imports/api/properties/Actions.js';
+import Attributes from '/imports/api/properties/Attributes.js';
+import Buffs from '/imports/api/properties/Buffs.js';
+import Classes from '/imports/api/properties/Classes.js';
+import ClassLevels from '/imports/api/properties/ClassLevels.js';
+import DamageMultipliers from '/imports/api/properties/DamageMultipliers.js';
+import Effects from '/imports/api/properties/Effects.js';
+import Experiences from '/imports/api/properties/Experiences.js';
+import Features from '/imports/api/properties/Features.js';
+import Folders from '/imports/api/properties/Folders.js';
+import Notes from '/imports/api/properties/Notes.js';
+import Proficiencies from '/imports/api/properties/Proficiencies.js';
+import Rolls from '/imports/api/properties/Rolls.js';
+import Skills from '/imports/api/properties/Skills.js';
+import SpellLists from '/imports/api/properties/SpellLists.js';
+import Spells from '/imports/api/properties/Spells.js';
+import Containers from '/imports/api/properties/Containers.js';
+import Items from '/imports/api/properties/Items.js';
 
 // All theses collections have the field {charId: String}
 // Collate them here in case we need to do something on all the collections of
diff --git a/app/imports/api/creature/creatureComputation.js b/app/imports/api/creature/creatureComputation.js
index 90fe7c60..7d062ff7 100644
--- a/app/imports/api/creature/creatureComputation.js
+++ b/app/imports/api/creature/creatureComputation.js
@@ -5,12 +5,12 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import SimpleSchema from 'simpl-schema';
 import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
 import Creatures from "/imports/api/creature/Creatures.js";
-import Attributes from "/imports/api/creature/properties/Attributes.js";
-import Skills from "/imports/api/creature/properties/Skills.js";
-import Effects from "/imports/api/creature/properties/Effects.js";
-import Proficiencies from "/imports/api/creature/properties/Proficiencies.js";
-import DamageMultipliers from "/imports/api/creature/properties/DamageMultipliers.js";
-import Classes from "/imports/api/creature/properties/Classes.js";
+import Attributes from "/imports/api/properties/Attributes.js";
+import Skills from "/imports/api/properties/Skills.js";
+import Effects from "/imports/api/properties/Effects.js";
+import Proficiencies from "/imports/api/properties/Proficiencies.js";
+import DamageMultipliers from "/imports/api/properties/DamageMultipliers.js";
+import Classes from "/imports/api/properties/Classes.js";
 import * as math from 'mathjs';
 import parser from '/imports/parser/parser.js';
 if (Meteor.isClient) console.log({parser});
diff --git a/app/imports/api/creature/insertCreature.js b/app/imports/api/creature/insertCreature.js
index 6eeb0df3..a485560b 100644
--- a/app/imports/api/creature/insertCreature.js
+++ b/app/imports/api/creature/insertCreature.js
@@ -1,11 +1,11 @@
 import getDefaultCharacterDocs from '/imports/api/creature/getDefaultCharacterDocs.js';
-import Attributes from '/imports/api/creature/properties/Attributes.js';
-import Skills from '/imports/api/creature/properties/Skills.js';
-import DamageMultipliers from '/imports/api/creature/properties/DamageMultipliers.js';
-import Effects from '/imports/api/creature/properties/Effects.js';
-import Containers from '/imports/api/creature/properties/inventory/Containers.js';
-import Items from '/imports/api/creature/properties/inventory/Items.js';
-import Classes from '/imports/api/creature/properties/Classes.js';
+import Attributes from '/imports/api/properties/Attributes.js';
+import Skills from '/imports/api/properties/Skills.js';
+import DamageMultipliers from '/imports/api/properties/DamageMultipliers.js';
+import Effects from '/imports/api/properties/Effects.js';
+import Containers from '/imports/api/properties/Containers.js';
+import Items from '/imports/api/properties/Items.js';
+import Classes from '/imports/api/properties/Classes.js';
 
 const addDefaultDocs = function(docs){
 	Attributes.rawCollection().insert(docs.attributes, {ordered: false});
diff --git a/app/imports/api/library/librarySchemas.js b/app/imports/api/library/librarySchemas.js
index f4c19a65..24190c3a 100644
--- a/app/imports/api/library/librarySchemas.js
+++ b/app/imports/api/library/librarySchemas.js
@@ -1,22 +1,22 @@
 import { CreatureSchema } from '/imports/api/creature/Creatures.js';
-import { ActionSchema } from '/imports/api/creature/properties/Actions.js';
-import { AttributeSchema } from '/imports/api/creature/properties/Attributes.js';
-import { StoredBuffSchema } from '/imports/api/creature/properties/Buffs.js';
-import { ClassSchema } from '/imports/api/creature/properties/Classes.js';
-import { ClassLevelSchema } from '/imports/api/creature/properties/ClassLevels.js';
-import { DamageMultiplierSchema } from '/imports/api/creature/properties/DamageMultipliers.js';
-import { EffectSchema } from '/imports/api/creature/properties/Effects.js';
-import { ExperienceSchema } from '/imports/api/creature/properties/Experiences.js';
-import { FeatureSchema } from '/imports/api/creature/properties/Features.js';
-import { FolderSchema } from '/imports/api/creature/properties/Folders.js';
-import { NoteSchema } from '/imports/api/creature/properties/Notes.js';
-import { ProficiencySchema } from '/imports/api/creature/properties/Proficiencies.js';
-import { RollSchema } from '/imports/api/creature/properties/Rolls.js';
-import { SkillSchema } from '/imports/api/creature/properties/Skills.js';
-import { SpellListSchema } from '/imports/api/creature/properties/SpellLists.js';
-import { SpellSchema } from '/imports/api/creature/properties/Spells.js';
-import { ContainerSchema } from '/imports/api/creature/properties/inventory/Containers.js';
-import { ItemSchema } from '/imports/api/creature/properties/inventory/Items.js';
+import { ActionSchema } from '/imports/api/properties/Actions.js';
+import { AttributeSchema } from '/imports/api/properties/Attributes.js';
+import { StoredBuffSchema } from '/imports/api/properties/Buffs.js';
+import { ClassSchema } from '/imports/api/properties/Classes.js';
+import { ClassLevelSchema } from '/imports/api/properties/ClassLevels.js';
+import { DamageMultiplierSchema } from '/imports/api/properties/DamageMultipliers.js';
+import { EffectSchema } from '/imports/api/properties/Effects.js';
+import { ExperienceSchema } from '/imports/api/properties/Experiences.js';
+import { FeatureSchema } from '/imports/api/properties/Features.js';
+import { FolderSchema } from '/imports/api/properties/Folders.js';
+import { NoteSchema } from '/imports/api/properties/Notes.js';
+import { ProficiencySchema } from '/imports/api/properties/Proficiencies.js';
+import { RollSchema } from '/imports/api/properties/Rolls.js';
+import { SkillSchema } from '/imports/api/properties/Skills.js';
+import { SpellListSchema } from '/imports/api/properties/SpellLists.js';
+import { SpellSchema } from '/imports/api/properties/Spells.js';
+import { ContainerSchema } from '/imports/api/properties/Containers.js';
+import { ItemSchema } from '/imports/api/properties/Items.js';
 
 
 const librarySchemas = {
diff --git a/app/imports/api/creature/properties/Actions.js b/app/imports/api/properties/Actions.js
similarity index 95%
rename from app/imports/api/creature/properties/Actions.js
rename to app/imports/api/properties/Actions.js
index b07cb3d3..ad964a59 100644
--- a/app/imports/api/creature/properties/Actions.js
+++ b/app/imports/api/properties/Actions.js
@@ -1,8 +1,8 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
 import AdjustmentSchema from '/imports/api/creature/subSchemas/AdjustmentSchema.js';
-import StoredBuffSchema from '/imports/api/creature/properties/Buffs.js';
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import StoredBuffSchema from '/imports/api/properties/Buffs.js';
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 import ColorSchema from '/imports/api/creature/subSchemas/ColorSchema.js';
 
 // Mixins
diff --git a/app/imports/api/creature/properties/Attributes.js b/app/imports/api/properties/Attributes.js
similarity index 98%
rename from app/imports/api/creature/properties/Attributes.js
rename to app/imports/api/properties/Attributes.js
index f2b0b350..12d8b15c 100644
--- a/app/imports/api/creature/properties/Attributes.js
+++ b/app/imports/api/properties/Attributes.js
@@ -1,4 +1,4 @@
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 import ColorSchema from '/imports/api/creature/subSchemas/ColorSchema.js';
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
diff --git a/app/imports/api/creature/properties/Buffs.js b/app/imports/api/properties/Buffs.js
similarity index 94%
rename from app/imports/api/creature/properties/Buffs.js
rename to app/imports/api/properties/Buffs.js
index 68785485..578a67a1 100644
--- a/app/imports/api/creature/properties/Buffs.js
+++ b/app/imports/api/properties/Buffs.js
@@ -1,7 +1,7 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
-import { EffectSchema } from '/imports/api/creature/properties/Effects.js';
+import { PropertySchema } from '/imports/api/properties/Properties.js'
+import { EffectSchema } from '/imports/api/properties/Effects.js';
 
 // Mixins
 import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js';
diff --git a/app/imports/api/creature/properties/ClassLevels.js b/app/imports/api/properties/ClassLevels.js
similarity index 96%
rename from app/imports/api/creature/properties/ClassLevels.js
rename to app/imports/api/properties/ClassLevels.js
index c224edd3..53a14d53 100644
--- a/app/imports/api/creature/properties/ClassLevels.js
+++ b/app/imports/api/properties/ClassLevels.js
@@ -1,6 +1,6 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 
 // Mixins
diff --git a/app/imports/api/creature/properties/Classes.js b/app/imports/api/properties/Classes.js
similarity index 95%
rename from app/imports/api/creature/properties/Classes.js
rename to app/imports/api/properties/Classes.js
index 1eb6a7f8..98a8d01a 100644
--- a/app/imports/api/creature/properties/Classes.js
+++ b/app/imports/api/properties/Classes.js
@@ -1,6 +1,6 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 import ColorSchema from "/imports/api/creature/subSchemas/ColorSchema.js";
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 
diff --git a/app/imports/api/creature/properties/inventory/Containers.js b/app/imports/api/properties/Containers.js
similarity index 92%
rename from app/imports/api/creature/properties/inventory/Containers.js
rename to app/imports/api/properties/Containers.js
index 3e3eba44..02522c8d 100644
--- a/app/imports/api/creature/properties/inventory/Containers.js
+++ b/app/imports/api/properties/Containers.js
@@ -1,7 +1,7 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
 import ColorSchema from "/imports/api/creature/subSchemas/ColorSchema.js";
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 import ChildSchema from '/imports/api/parenting/ChildSchema.js';
 
 //set up the collection for containers
diff --git a/app/imports/api/creature/properties/DamageMultipliers.js b/app/imports/api/properties/DamageMultipliers.js
similarity index 96%
rename from app/imports/api/creature/properties/DamageMultipliers.js
rename to app/imports/api/properties/DamageMultipliers.js
index c652a0af..578963c8 100644
--- a/app/imports/api/creature/properties/DamageMultipliers.js
+++ b/app/imports/api/properties/DamageMultipliers.js
@@ -1,6 +1,6 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 import DAMAGE_TYPES from '/imports/constants/DAMAGE_TYPES.js';
 
 // Mixins
diff --git a/app/imports/api/creature/properties/Effects.js b/app/imports/api/properties/Effects.js
similarity index 97%
rename from app/imports/api/creature/properties/Effects.js
rename to app/imports/api/properties/Effects.js
index b568e096..5281a42e 100644
--- a/app/imports/api/creature/properties/Effects.js
+++ b/app/imports/api/properties/Effects.js
@@ -1,6 +1,6 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 
 // Mixins
 import recomputeCreatureMixin from '/imports/api/creature/mixins/recomputeCreatureMixin.js';
diff --git a/app/imports/api/creature/properties/Experiences.js b/app/imports/api/properties/Experiences.js
similarity index 97%
rename from app/imports/api/creature/properties/Experiences.js
rename to app/imports/api/properties/Experiences.js
index 502f7d81..9167d68b 100644
--- a/app/imports/api/creature/properties/Experiences.js
+++ b/app/imports/api/properties/Experiences.js
@@ -1,6 +1,6 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 import recomputeCreatureXP from '/imports/api/creature/creatureComputation.js';
 
 // Mixins
diff --git a/app/imports/api/creature/properties/Features.js b/app/imports/api/properties/Features.js
similarity index 95%
rename from app/imports/api/creature/properties/Features.js
rename to app/imports/api/properties/Features.js
index a035d664..c1c0ada2 100644
--- a/app/imports/api/creature/properties/Features.js
+++ b/app/imports/api/properties/Features.js
@@ -1,6 +1,6 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 import ColorSchema from '/imports/api/creature/subSchemas/ColorSchema.js';
 
 // Mixins
diff --git a/app/imports/api/creature/properties/Folders.js b/app/imports/api/properties/Folders.js
similarity index 95%
rename from app/imports/api/creature/properties/Folders.js
rename to app/imports/api/properties/Folders.js
index 94413cd0..48cbea7e 100644
--- a/app/imports/api/creature/properties/Folders.js
+++ b/app/imports/api/properties/Folders.js
@@ -1,6 +1,6 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 
 // Mixins
 import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js';
diff --git a/app/imports/api/creature/properties/inventory/Items.js b/app/imports/api/properties/Items.js
similarity index 94%
rename from app/imports/api/creature/properties/inventory/Items.js
rename to app/imports/api/properties/Items.js
index a87291f1..ada8a7fa 100644
--- a/app/imports/api/creature/properties/inventory/Items.js
+++ b/app/imports/api/properties/Items.js
@@ -1,7 +1,7 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
 import ColorSchema from "/imports/api/creature/subSchemas/ColorSchema.js";
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 import ChildSchema from '/imports/api/parenting/ChildSchema.js';
 
 Items = new Mongo.Collection("items");
diff --git a/app/imports/api/creature/properties/Notes.js b/app/imports/api/properties/Notes.js
similarity index 95%
rename from app/imports/api/creature/properties/Notes.js
rename to app/imports/api/properties/Notes.js
index a2609727..2ac4674c 100644
--- a/app/imports/api/creature/properties/Notes.js
+++ b/app/imports/api/properties/Notes.js
@@ -1,7 +1,7 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
 import ColorSchema from "/imports/api/creature/subSchemas/ColorSchema.js";
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 
 // Mixins
 import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js';
diff --git a/app/imports/api/creature/properties/Proficiencies.js b/app/imports/api/properties/Proficiencies.js
similarity index 96%
rename from app/imports/api/creature/properties/Proficiencies.js
rename to app/imports/api/properties/Proficiencies.js
index f61ddfd2..f0d37aa1 100644
--- a/app/imports/api/creature/properties/Proficiencies.js
+++ b/app/imports/api/properties/Proficiencies.js
@@ -1,6 +1,6 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 
 // Mixins
 import recomputeCreatureMixin from '/imports/api/creature/mixins/recomputeCreatureMixin.js';
diff --git a/app/imports/api/creature/properties/Properties.js b/app/imports/api/properties/Properties.js
similarity index 100%
rename from app/imports/api/creature/properties/Properties.js
rename to app/imports/api/properties/Properties.js
diff --git a/app/imports/api/creature/properties/Rolls.js b/app/imports/api/properties/Rolls.js
similarity index 95%
rename from app/imports/api/creature/properties/Rolls.js
rename to app/imports/api/properties/Rolls.js
index 9682df4c..9fd772ae 100644
--- a/app/imports/api/creature/properties/Rolls.js
+++ b/app/imports/api/properties/Rolls.js
@@ -1,7 +1,7 @@
 import SimpleSchema from 'simpl-schema';
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 import AdjustmentSchema from '/imports/api/creature/subSchemas/AdjustmentSchema.js';
-import StoredBuffSchema from '/imports/api/creature/properties/Buffs.js';
+import StoredBuffSchema from '/imports/api/properties/Buffs.js';
 
 // Mixins
 import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js';
diff --git a/app/imports/api/creature/properties/Skills.js b/app/imports/api/properties/Skills.js
similarity index 97%
rename from app/imports/api/creature/properties/Skills.js
rename to app/imports/api/properties/Skills.js
index e0df4832..7a8d05c2 100644
--- a/app/imports/api/creature/properties/Skills.js
+++ b/app/imports/api/properties/Skills.js
@@ -1,6 +1,6 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 import ColorSchema from '/imports/api/creature/subSchemas/ColorSchema.js';
 
 // Mixins
diff --git a/app/imports/api/creature/properties/SpellLists.js b/app/imports/api/properties/SpellLists.js
similarity index 96%
rename from app/imports/api/creature/properties/SpellLists.js
rename to app/imports/api/properties/SpellLists.js
index d6007069..3f746408 100644
--- a/app/imports/api/creature/properties/SpellLists.js
+++ b/app/imports/api/properties/SpellLists.js
@@ -1,7 +1,7 @@
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
 import ColorSchema from "/imports/api/creature/subSchemas/ColorSchema.js";
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 
 // Mixins
 import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js';
diff --git a/app/imports/api/creature/properties/Spells.js b/app/imports/api/properties/Spells.js
similarity index 97%
rename from app/imports/api/creature/properties/Spells.js
rename to app/imports/api/properties/Spells.js
index 740b291f..a49b7737 100644
--- a/app/imports/api/creature/properties/Spells.js
+++ b/app/imports/api/properties/Spells.js
@@ -1,7 +1,7 @@
 import ColorSchema from '/imports/api/creature/subSchemas/ColorSchema.js';
 import SimpleSchema from 'simpl-schema';
 import schema from '/imports/api/schema.js';
-import { PropertySchema } from '/imports/api/creature/properties/Properties.js'
+import { PropertySchema } from '/imports/api/properties/Properties.js'
 
 // Mixins
 import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js';
diff --git a/app/imports/ui/creature/character/FeaturesTab.vue b/app/imports/ui/creature/character/FeaturesTab.vue
index ad07013a..67aa6b1f 100644
--- a/app/imports/ui/creature/character/FeaturesTab.vue
+++ b/app/imports/ui/creature/character/FeaturesTab.vue
@@ -23,8 +23,8 @@
 
 <script>
 	import Creatures from '/imports/api/creature/Creatures.js';
-	import Features, { updateFeature } from '/imports/api/creature/properties/Features.js';
-	import { insertFeature } from '/imports/api/creature/properties/Features.js';
+	import Features, { updateFeature } from '/imports/api/properties/Features.js';
+	import { insertFeature } from '/imports/api/properties/Features.js';
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
 	import FeatureCard from '/imports/ui/creature/properties/features/FeatureCard.vue';
 	import { evaluateComputation, evaluateStringWithVariables } from '/imports/ui/utility/evaluate.js';
diff --git a/app/imports/ui/creature/character/StatsTab.vue b/app/imports/ui/creature/character/StatsTab.vue
index 2ffcbea0..d93d59cb 100644
--- a/app/imports/ui/creature/character/StatsTab.vue
+++ b/app/imports/ui/creature/character/StatsTab.vue
@@ -138,8 +138,8 @@
 </template>
 
 <script>
-	import Attributes from '/imports/api/creature/properties/Attributes.js';
-	import Skills from '/imports/api/creature/properties/Skills.js';
+	import Attributes from '/imports/api/properties/Attributes.js';
+	import Skills from '/imports/api/properties/Skills.js';
 	import AttributeCard from '/imports/ui/creature/properties/attributes/AttributeCard.vue';
 	import AbilityListTile from '/imports/ui/creature/properties/attributes/AbilityListTile.vue';
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
@@ -149,7 +149,7 @@
 	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';
+	import { adjustAttribute, insertAttribute } from '/imports/api/properties/Attributes.js';
 
 	const getAttributeOfType = function(charId, type){
 		return Attributes.find({charId, type}, {sort: {order: 1}});
diff --git a/app/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue b/app/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue
index 85646e5c..91033393 100644
--- a/app/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue
+++ b/app/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue
@@ -23,7 +23,7 @@
 
 <script>
 	import AttributeForm from '/imports/ui/forms/AttributeForm.vue';
-	import Attributes from '/imports/api/creature/properties/Attributes.js';
+	import Attributes from '/imports/api/properties/Attributes.js';
 	import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
 
 	export default {
diff --git a/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue b/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue
index 2215dd89..77370695 100644
--- a/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue
+++ b/app/imports/ui/creature/properties/attributes/AttributeDialogContainer.vue
@@ -8,12 +8,12 @@
 
 <script>
 	import AttributeDialog from '/imports/ui/creature/properties/attributes/AttributeDialog.vue';
-	import Attributes from '/imports/api/creature/properties/Attributes.js';
+	import Attributes from '/imports/api/properties/Attributes.js';
 	import {
 		updateAttribute,
 		adjustAttribute
-	} from '/imports/api/creature/properties/Attributes.js';
-	import Effects from '/imports/api/creature/properties/Effects.js';
+	} from '/imports/api/properties/Attributes.js';
+	import Effects from '/imports/api/properties/Effects.js';
 	import { setName } from '/imports/api/parenting/parenting.js';
 
 	export default {
diff --git a/app/imports/ui/creature/properties/attributes/HealthBarCardContainer.vue b/app/imports/ui/creature/properties/attributes/HealthBarCardContainer.vue
index fd04e5d1..04393f75 100644
--- a/app/imports/ui/creature/properties/attributes/HealthBarCardContainer.vue
+++ b/app/imports/ui/creature/properties/attributes/HealthBarCardContainer.vue
@@ -7,8 +7,8 @@
 </template>
 
 <script>
-	import Attributes from '/imports/api/creature/properties/Attributes.js';
-	import { adjustAttribute } from '/imports/api/creature/properties/Attributes.js';
+	import Attributes from '/imports/api/properties/Attributes.js';
+	import { adjustAttribute } from '/imports/api/properties/Attributes.js';
 	import HealthBarCard from '/imports/ui/creature/properties/attributes/HealthBarCard.vue';
 
 	export default {
diff --git a/app/imports/ui/creature/properties/features/FeatureCreationDialog.vue b/app/imports/ui/creature/properties/features/FeatureCreationDialog.vue
index 61123f04..40aed7a3 100644
--- a/app/imports/ui/creature/properties/features/FeatureCreationDialog.vue
+++ b/app/imports/ui/creature/properties/features/FeatureCreationDialog.vue
@@ -16,7 +16,7 @@
 
 <script>
 	import FeatureForm from '/imports/ui/forms/FeatureForm.vue';
-	import Features, { FeatureSchema } from '/imports/api/creature/properties/Features.js';
+	import Features, { FeatureSchema } from '/imports/api/properties/Features.js';
 	import PropertyInsertDialog from '/imports/ui/components/properties/PropertyInsertDialog.vue';
 
 	export default {
diff --git a/app/imports/ui/creature/properties/features/FeatureDialogContainer.vue b/app/imports/ui/creature/properties/features/FeatureDialogContainer.vue
index c60500f4..9321bf98 100644
--- a/app/imports/ui/creature/properties/features/FeatureDialogContainer.vue
+++ b/app/imports/ui/creature/properties/features/FeatureDialogContainer.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-	import Features, {updateFeature} from '/imports/api/creature/properties/Features.js';
+	import Features, {updateFeature} from '/imports/api/properties/Features.js';
 	import FeatureDialog from '/imports/ui/creature/properties/features/FeatureDialog.vue';
 	import {evaluateStringForCharId} from '/imports/ui/utility/evaluate.js';
 
diff --git a/app/imports/ui/creature/properties/skills/SkillDialogContainer.vue b/app/imports/ui/creature/properties/skills/SkillDialogContainer.vue
index b9f74067..7c403bcc 100644
--- a/app/imports/ui/creature/properties/skills/SkillDialogContainer.vue
+++ b/app/imports/ui/creature/properties/skills/SkillDialogContainer.vue
@@ -11,11 +11,11 @@
 <script>
 
 	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';
-	import Effects from '/imports/api/creature/properties/Effects.js';
-	import Proficiencies from '/imports/api/creature/properties/Proficiencies.js';
+	import Skills from '/imports/api/properties/Skills.js';
+	import { updateSkill } from '/imports/api/properties/Skills.js';
+	import Attributes from '/imports/api/properties/Attributes.js';
+	import Effects from '/imports/api/properties/Effects.js';
+	import Proficiencies from '/imports/api/properties/Proficiencies.js';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/forms/BuffListForm.vue b/app/imports/ui/forms/BuffListForm.vue
index 9f715dad..377ec0aa 100644
--- a/app/imports/ui/forms/BuffListForm.vue
+++ b/app/imports/ui/forms/BuffListForm.vue
@@ -40,7 +40,7 @@
 
 <script>
 	import BuffForm from '/imports/ui/forms/BuffForm.vue';
-	import {StoredBuffSchema, AppliedBuffSchema} from '/imports/api/creature/properties/Buffs.js';
+	import {StoredBuffSchema, AppliedBuffSchema} from '/imports/api/properties/Buffs.js';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/forms/EffectListForm.vue b/app/imports/ui/forms/EffectListForm.vue
index 053b7b25..0f739804 100644
--- a/app/imports/ui/forms/EffectListForm.vue
+++ b/app/imports/ui/forms/EffectListForm.vue
@@ -39,7 +39,7 @@
 
 <script>
 	import EffectForm from '/imports/ui/forms/EffectForm.vue';
-	import { EffectSchema } from '/imports/api/creature/properties/Effects.js';
+	import { EffectSchema } from '/imports/api/properties/Effects.js';
 
 	export default {
 		components: {
@@ -115,7 +115,7 @@
 
 <script>
 	import EffectForm from '/imports/ui/forms/EffectForm.vue';
-	import { EffectSchema } from '/imports/api/creature/properties/Effects.js';
+	import { EffectSchema } from '/imports/api/properties/Effects.js';
 
 	export default {
 		components: {