diff --git a/app/Model/Campaign/Instance.js b/app/imports/Model/Campaign/Instance.js
similarity index 100%
rename from app/Model/Campaign/Instance.js
rename to app/imports/Model/Campaign/Instance.js
diff --git a/app/Model/Campaign/Party.js b/app/imports/Model/Campaign/Party.js
similarity index 100%
rename from app/Model/Campaign/Party.js
rename to app/imports/Model/Campaign/Party.js
diff --git a/app/Model/Creature/Actions.js b/app/imports/Model/Creature/Actions.js
similarity index 100%
rename from app/Model/Creature/Actions.js
rename to app/imports/Model/Creature/Actions.js
diff --git a/app/Model/Creature/Attacks.js b/app/imports/Model/Creature/Attacks.js
similarity index 100%
rename from app/Model/Creature/Attacks.js
rename to app/imports/Model/Creature/Attacks.js
diff --git a/app/Model/Creature/Attributes.js b/app/imports/Model/Creature/Attributes.js
similarity index 100%
rename from app/Model/Creature/Attributes.js
rename to app/imports/Model/Creature/Attributes.js
diff --git a/app/Model/Creature/Buffs.js b/app/imports/Model/Creature/Buffs.js
similarity index 100%
rename from app/Model/Creature/Buffs.js
rename to app/imports/Model/Creature/Buffs.js
diff --git a/app/Model/Creature/CharacterComputation.js b/app/imports/Model/Creature/CharacterComputation.js
similarity index 100%
rename from app/Model/Creature/CharacterComputation.js
rename to app/imports/Model/Creature/CharacterComputation.js
diff --git a/app/Model/Creature/CharacterComputation.test.js b/app/imports/Model/Creature/CharacterComputation.test.js
similarity index 100%
rename from app/Model/Creature/CharacterComputation.test.js
rename to app/imports/Model/Creature/CharacterComputation.test.js
diff --git a/app/Model/Creature/Classes.js b/app/imports/Model/Creature/Classes.js
similarity index 100%
rename from app/Model/Creature/Classes.js
rename to app/imports/Model/Creature/Classes.js
diff --git a/app/Model/Creature/Conditions.js b/app/imports/Model/Creature/Conditions.js
similarity index 100%
rename from app/Model/Creature/Conditions.js
rename to app/imports/Model/Creature/Conditions.js
diff --git a/app/Model/Creature/Creatures.js b/app/imports/Model/Creature/Creatures.js
similarity index 96%
rename from app/Model/Creature/Creatures.js
rename to app/imports/Model/Creature/Creatures.js
index 41988d6a..bd9e531e 100644
--- a/app/Model/Creature/Creatures.js
+++ b/app/imports/Model/Creature/Creatures.js
@@ -23,6 +23,7 @@ Schemas.Creature = new SimpleSchema({
 	xp:            {type: Number, defaultValue: 0},
 	weightCarried: {type: Number, defaultValue: 0},
 	level:         {type: Number, defaultValue: 0},
+	type:          {type: String, defaultValue: "pc", allowedValues: ["pc", "npc", "monster"]},
 
 	//permissions
 	party:   {type: String, regEx: SimpleSchema.RegEx.Id, optional: true},
@@ -71,9 +72,9 @@ Creatures.calculate = {
 	},
 };
 
-const insertCreatureMethod = new ValidatedMethod({
+const insertCharacter = new ValidatedMethod({
 
-  name: "Creatures.methods.insert", // DDP method name
+  name: "Creatures.methods.insertCharacter", // DDP method name
 
   validate: new SimpleSchema({
 	  name: {
diff --git a/app/Model/Creature/CustomBuffs.js b/app/imports/Model/Creature/CustomBuffs.js
similarity index 100%
rename from app/Model/Creature/CustomBuffs.js
rename to app/imports/Model/Creature/CustomBuffs.js
diff --git a/app/Model/Creature/DamageMultipliers.js b/app/imports/Model/Creature/DamageMultipliers.js
similarity index 100%
rename from app/Model/Creature/DamageMultipliers.js
rename to app/imports/Model/Creature/DamageMultipliers.js
diff --git a/app/Model/Creature/Effects.js b/app/imports/Model/Creature/Effects.js
similarity index 100%
rename from app/Model/Creature/Effects.js
rename to app/imports/Model/Creature/Effects.js
diff --git a/app/Model/Creature/Experience.js b/app/imports/Model/Creature/Experience.js
similarity index 100%
rename from app/Model/Creature/Experience.js
rename to app/imports/Model/Creature/Experience.js
diff --git a/app/Model/Creature/Features.js b/app/imports/Model/Creature/Features.js
similarity index 100%
rename from app/Model/Creature/Features.js
rename to app/imports/Model/Creature/Features.js
diff --git a/app/Model/Creature/Notes.js b/app/imports/Model/Creature/Notes.js
similarity index 100%
rename from app/Model/Creature/Notes.js
rename to app/imports/Model/Creature/Notes.js
diff --git a/app/Model/Creature/Proficiencies.js b/app/imports/Model/Creature/Proficiencies.js
similarity index 100%
rename from app/Model/Creature/Proficiencies.js
rename to app/imports/Model/Creature/Proficiencies.js
diff --git a/app/Model/Creature/Skills.js b/app/imports/Model/Creature/Skills.js
similarity index 100%
rename from app/Model/Creature/Skills.js
rename to app/imports/Model/Creature/Skills.js
diff --git a/app/Model/Creature/SpellLists.js b/app/imports/Model/Creature/SpellLists.js
similarity index 100%
rename from app/Model/Creature/SpellLists.js
rename to app/imports/Model/Creature/SpellLists.js
diff --git a/app/Model/Creature/Spells.js b/app/imports/Model/Creature/Spells.js
similarity index 100%
rename from app/Model/Creature/Spells.js
rename to app/imports/Model/Creature/Spells.js
diff --git a/app/Model/Creature/SubSchemas/Adjustment.js b/app/imports/Model/Creature/SubSchemas/Adjustment.js
similarity index 100%
rename from app/Model/Creature/SubSchemas/Adjustment.js
rename to app/imports/Model/Creature/SubSchemas/Adjustment.js
diff --git a/app/Model/Creature/SubSchemas/Attribute.js b/app/imports/Model/Creature/SubSchemas/Attribute.js
similarity index 100%
rename from app/Model/Creature/SubSchemas/Attribute.js
rename to app/imports/Model/Creature/SubSchemas/Attribute.js
diff --git a/app/Model/Creature/SubSchemas/DeathSaves.js b/app/imports/Model/Creature/SubSchemas/DeathSaves.js
similarity index 100%
rename from app/Model/Creature/SubSchemas/DeathSaves.js
rename to app/imports/Model/Creature/SubSchemas/DeathSaves.js
diff --git a/app/Model/Creature/SubSchemas/Skill.js b/app/imports/Model/Creature/SubSchemas/Skill.js
similarity index 100%
rename from app/Model/Creature/SubSchemas/Skill.js
rename to app/imports/Model/Creature/SubSchemas/Skill.js
diff --git a/app/Model/Creature/TemporaryHitPoints.js b/app/imports/Model/Creature/TemporaryHitPoints.js
similarity index 100%
rename from app/Model/Creature/TemporaryHitPoints.js
rename to app/imports/Model/Creature/TemporaryHitPoints.js
diff --git a/app/Model/Inventory/Containers.js b/app/imports/Model/Inventory/Containers.js
similarity index 100%
rename from app/Model/Inventory/Containers.js
rename to app/imports/Model/Inventory/Containers.js
diff --git a/app/Model/Inventory/Items.js b/app/imports/Model/Inventory/Items.js
similarity index 100%
rename from app/Model/Inventory/Items.js
rename to app/imports/Model/Inventory/Items.js
diff --git a/app/Model/Library/Library.js b/app/imports/Model/Library/Library.js
similarity index 100%
rename from app/Model/Library/Library.js
rename to app/imports/Model/Library/Library.js
diff --git a/app/Model/Library/LibraryItems.js b/app/imports/Model/Library/LibraryItems.js
similarity index 100%
rename from app/Model/Library/LibraryItems.js
rename to app/imports/Model/Library/LibraryItems.js
diff --git a/app/Model/Library/LibrarySpells.js b/app/imports/Model/Library/LibrarySpells.js
similarity index 100%
rename from app/Model/Library/LibrarySpells.js
rename to app/imports/Model/Library/LibrarySpells.js
diff --git a/app/Model/Library/subSchemas/LibraryAttacks.js b/app/imports/Model/Library/subSchemas/LibraryAttacks.js
similarity index 100%
rename from app/Model/Library/subSchemas/LibraryAttacks.js
rename to app/imports/Model/Library/subSchemas/LibraryAttacks.js
diff --git a/app/Model/Library/subSchemas/LibraryEffects.js b/app/imports/Model/Library/subSchemas/LibraryEffects.js
similarity index 100%
rename from app/Model/Library/subSchemas/LibraryEffects.js
rename to app/imports/Model/Library/subSchemas/LibraryEffects.js
diff --git a/app/Model/Meta/Blacklist.js b/app/imports/Model/Meta/Blacklist.js
similarity index 100%
rename from app/Model/Meta/Blacklist.js
rename to app/imports/Model/Meta/Blacklist.js
diff --git a/app/Model/Meta/ChangeLogs.js b/app/imports/Model/Meta/ChangeLogs.js
similarity index 100%
rename from app/Model/Meta/ChangeLogs.js
rename to app/imports/Model/Meta/ChangeLogs.js
diff --git a/app/Model/Meta/Reports.js b/app/imports/Model/Meta/Reports.js
similarity index 100%
rename from app/Model/Meta/Reports.js
rename to app/imports/Model/Meta/Reports.js
diff --git a/app/Model/Users/Users.js b/app/imports/Model/Users/Users.js
similarity index 100%
rename from app/Model/Users/Users.js
rename to app/imports/Model/Users/Users.js