diff --git a/items.json b/items.json
deleted file mode 100644
index 5b2b9a14..00000000
--- a/items.json
+++ /dev/null
@@ -1,814 +0,0 @@
-item: Advanced Crafting Table
-    recipe:
-        input: Chest, Crafting Table, Obsidian, Redstone Chipset
-        pattern: 212 202 232
-
-item: Architect Table
-    recipe:
-        input: Blueprint, Crafting Table, Dandelion Yellow, Diamond Gear, Ink Sac, Land Mark
-        pattern: 454 212 303
-
-item: Assembly Table
-    recipe:
-        input: Diamond, Diamond Gear, Obsidian, Redstone
-        pattern: 232 202 212
-
-item: Auto Workbench
-    recipe:
-        input: Crafting Table, Wood Gear
-        pattern: .1. 101 .1.
-
-item: Basic Gate
-    gatherable: true
-
-item: Basic Gate (Autarchic Pulsar)
-    gatherable: true
-
-item: Basic Gate (Clock Timer)
-    gatherable: true
-
-item: Basic Gate (Redstone Fader)
-    gatherable: true
-
-item: Blue Pipe Wire
-    gatherable: true
-
-item: Blueprint
-    recipe:
-        input: Lapis Lazuli, Paper
-        pattern: 111 101 111
-
-item: Blueprint Library
-    recipe:
-        input: Blueprint, Bookshelf
-        pattern: 000 010 000
-
-item: Builder
-    recipe:
-        input: Chest, Crafting Table, Dandelion Yellow, Diamond Gear, Ink Sac, Land Mark
-        pattern: 454 212 303
-
-item: Charging Table
-    recipe:
-        input: Gold Gear, Obsidian, Redstone, Redstone Chipset
-        pattern: 121 131 101
-
-item: Chute
-    recipe:
-        input: Chest, Iron Ingot, Stone Gear
-        pattern: 101 121 .1.
-
-item: Clay Transport Pipe
-    recipe:
-        input: Clay, Glass
-        pattern: 010 ... ...
-
-item: Cobblestone Fluid Pipe
-    gatherable: true
-
-item: Cobblestone Kinesis Pipe
-    gatherable: true
-
-item: Cobblestone Structure Pipe
-    gatherable: true
-
-item: Cobblestone Transport Pipe
-    recipe:
-        input: Cobblestone, Glass
-        pattern: 010 ... ...
-
-item: Combustion Engine
-    recipe:
-        input: Glass, Iron Gear, Iron Ingot, Piston
-        pattern: 222 .0. 131
-
-item: Construction Mark
-    recipe:
-        input: Gold Gear, Redstone Torch
-        pattern: 0.1 ... ...
-
-item: Creative Engine
-    gatherable: true
-
-item: Daizuli Transport Pipe
-    recipe:
-        input: Diamond, Glass, Lapis Lazuli Block
-        pattern: 210 ... ...
-
-item: Diamond AND Gate
-    gatherable: true
-
-item: Diamond AND Gate (Autarchic Pulsar)
-    gatherable: true
-
-item: Diamond AND Gate (Clock Timer)
-    gatherable: true
-
-item: Diamond AND Gate (Redstone Fader)
-    gatherable: true
-
-item: Diamond Chipset
-    gatherable: true
-
-item: Diamond Fluid Pipe
-    gatherable: true
-
-item: Diamond Gear
-    recipe:
-        input: Diamond, Gold Gear
-        pattern: .0. 010 .0.
-
-item: Diamond Kinesis Pipe
-    gatherable: true
-
-item: Diamond OR Gate
-    gatherable: true
-
-item: Diamond OR Gate (Autarchic Pulsar)
-    gatherable: true
-
-item: Diamond OR Gate (Clock Timer)
-    gatherable: true
-
-item: Diamond OR Gate (Redstone Fader)
-    gatherable: true
-
-item: Diamond Transport Pipe
-    recipe:
-        input: Diamond, Glass
-        pattern: 010 ... ...
-
-item: Docking Station
-    recipe:
-        input: Golden Chipset, Iron Ingot
-        pattern: ... .1. 101
-
-item: Emerald AND Gate
-    gatherable: true
-
-item: Emerald AND Gate (Autarchic Pulsar)
-    gatherable: true
-
-item: Emerald AND Gate (Clock Timer)
-    gatherable: true
-
-item: Emerald AND Gate (Redstone Fader)
-    gatherable: true
-
-item: Emerald Chipset
-    gatherable: true
-
-item: Emerald Fluid Pipe
-    gatherable: true
-
-item: Emerald Kinesis Pipe
-    gatherable: true
-
-item: Emerald OR Gate
-    gatherable: true
-
-item: Emerald OR Gate (Autarchic Pulsar)
-    gatherable: true
-
-item: Emerald OR Gate (Clock Timer)
-    gatherable: true
-
-item: Emerald OR Gate (Redstone Fader)
-    gatherable: true
-
-item: Emerald Transport Pipe
-    recipe:
-        input: Emerald, Glass
-        pattern: 010 ... ...
-
-item: Emzuli Transport Pipe
-    recipe:
-        input: Emerald, Glass, Lapis Lazuli Block
-        pattern: 210 ... ...
-
-item: End Stone Facade
-    gatherable: true
-
-item: End Stone Hollow Facade
-    gatherable: true
-
-item: Filler
-    recipe:
-        input: Chest, Crafting Table, Dandelion Yellow, Gold Gear, Ink Sac, Land Mark
-        pattern: 454 212 303
-
-item: Filter (Black)
-    gatherable: true
-
-item: Filter (Blue)
-    gatherable: true
-
-item: Filter (Brown)
-    gatherable: true
-
-item: Filter (Cyan)
-    gatherable: true
-
-item: Filter (Gray)
-    gatherable: true
-
-item: Filter (Green)
-    gatherable: true
-
-item: Filter (Light Blue)
-    gatherable: true
-
-item: Filter (Light Gray)
-    gatherable: true
-
-item: Filter (Lime)
-    gatherable: true
-
-item: Filter (Magenta)
-    gatherable: true
-
-item: Filter (Orange)
-    gatherable: true
-
-item: Filter (Pink)
-    gatherable: true
-
-item: Filter (Purple)
-    gatherable: true
-
-item: Filter (Red)
-    gatherable: true
-
-item: Filter (White)
-    gatherable: true
-
-item: Filter (Yellow)
-    gatherable: true
-
-item: Filtered Buffer
-    recipe:
-        input: Chest, Diamond Transport Pipe, Oak Wood Planks, Piston
-        pattern: 212 202 232
-
-item: Flood Gate
-    recipe:
-        input: Iron Bars, Iron Gear, Iron Ingot, Tank
-        pattern: 212 030 202
-
-item: Frame
-    gatherable: true
-
-item: Fuel
-    gatherable: true
-
-item: Fuel Bucket
-    gatherable: true
-
-item: Gate Copier
-    gatherable: true
-
-item: Gold AND Gate
-    gatherable: true
-
-item: Gold AND Gate (Autarchic Pulsar)
-    gatherable: true
-
-item: Gold AND Gate (Clock Timer)
-    gatherable: true
-
-item: Gold AND Gate (Redstone Fader)
-    gatherable: true
-
-item: Gold Gear
-    recipe:
-        input: Gold Ingot, Iron Gear
-        pattern: .0. 010 .0.
-
-item: Gold OR Gate
-    gatherable: true
-
-item: Gold OR Gate (Autarchic Pulsar)
-    gatherable: true
-
-item: Gold OR Gate (Clock Timer)
-    gatherable: true
-
-item: Gold OR Gate (Redstone Fader)
-    gatherable: true
-
-item: Golden Chipset
-    gatherable: true
-
-item: Golden Fluid Pipe
-    gatherable: true
-
-item: Golden Kinesis Pipe
-    gatherable: true
-
-item: Golden Transport Pipe
-    recipe:
-        input: Glass, Gold Ingot
-        pattern: 101 ... ...
-
-item: Green Pipe Wire
-    gatherable: true
-
-item: Integration Table
-    recipe:
-        input: Diamond Gear, Obsidian, Redstone, Redstone Chipset
-        pattern: 121 131 101
-
-item: Iron AND Gate
-    gatherable: true
-
-item: Iron AND Gate (Autarchic Pulsar)
-    gatherable: true
-
-item: Iron AND Gate (Clock Timer)
-    gatherable: true
-
-item: Iron AND Gate (Redstone Fader)
-    gatherable: true
-
-item: Iron Chipset
-    gatherable: true
-
-item: Iron Fluid Pipe
-    gatherable: true
-
-item: Iron Gear
-    recipe:
-        input: Iron Ingot, Stone Gear
-        pattern: .0. 010 .0.
-
-item: Iron Kinesis Pipe
-    gatherable: true
-
-item: Iron OR Gate
-    gatherable: true
-
-item: Iron OR Gate (Autarchic Pulsar)
-    gatherable: true
-
-item: Iron OR Gate (Clock Timer)
-    gatherable: true
-
-item: Iron OR Gate (Redstone Fader)
-    gatherable: true
-
-item: Iron Transport Pipe
-    recipe:
-        input: Glass, Iron Ingot
-        pattern: 101 ... ...
-
-item: Land Mark
-    recipe:
-        input: Lapis Lazuli, Redstone Torch
-        pattern: 0.1 ... ...
-
-item: Laser
-    recipe:
-        input: Diamond, Obsidian, Redstone
-        pattern: 122 002 122
-
-item: Lazuli Transport Pipe
-    recipe:
-        input: Glass, Lapis Lazuli Block
-        pattern: 101 ... ...
-
-item: Lens (Black)
-    gatherable: true
-
-item: Lens (Blue)
-    gatherable: true
-
-item: Lens (Brown)
-    gatherable: true
-
-item: Lens (Cyan)
-    gatherable: true
-
-item: Lens (Gray)
-    gatherable: true
-
-item: Lens (Green)
-    gatherable: true
-
-item: Lens (Light Blue)
-    gatherable: true
-
-item: Lens (Light Gray)
-    gatherable: true
-
-item: Lens (Lime)
-    gatherable: true
-
-item: Lens (Magenta)
-    gatherable: true
-
-item: Lens (Orange)
-    gatherable: true
-
-item: Lens (Pink)
-    gatherable: true
-
-item: Lens (Purple)
-    gatherable: true
-
-item: Lens (Red)
-    gatherable: true
-
-item: Lens (White)
-    gatherable: true
-
-item: Lens (Yellow)
-    gatherable: true
-
-item: List
-    recipe:
-        input: Cactus Green, Paper
-        pattern: 111 101 111
-
-item: Map Location
-    recipe:
-        input: Dandelion Yellow, Paper
-        pattern: 111 101 111
-
-item: Mining Pipe
-    gatherable: true
-
-item: Mining Well
-    recipe:
-        input: Iron Gear, Iron Ingot, Iron Pickaxe, Redstone
-        pattern: 131 101 121
-
-item: Moss Stone Facade
-    gatherable: true
-
-item: Moss Stone Hollow Facade
-    gatherable: true
-
-item: Obsidian Transport Pipe
-    recipe:
-        input: Glass, Obsidian
-        pattern: 101 ... ...
-
-item: Oil
-    gatherable: true
-
-item: Oil Bucket
-    gatherable: true
-
-item: Path Mark
-    recipe:
-        input: Cactus Green, Redstone Torch
-        pattern: 0.1 ... ...
-
-item: Pipe Plug
-    gatherable: true
-
-item: Pipe Sealant
-    gatherable: true
-
-item: Programming Table
-    recipe:
-        input: Diamond Gear, Emerald, Obsidian, Redstone
-        pattern: 232 212 202
-
-item: Pulsating Chipset
-    gatherable: true
-
-item: Pump
-    recipe:
-        input: Mining Well, Tank
-        pattern: 10. ... ...
-
-item: Quarry
-    recipe:
-        input: Diamond Gear, Diamond Pickaxe, Gold Gear, Iron Gear, Redstone
-        pattern: 343 232 010
-
-item: Quartz AND Gate
-    gatherable: true
-
-item: Quartz AND Gate (Autarchic Pulsar)
-    gatherable: true
-
-item: Quartz AND Gate (Clock Timer)
-    gatherable: true
-
-item: Quartz AND Gate (Redstone Fader)
-    gatherable: true
-
-item: Quartz Chipset
-    gatherable: true
-
-item: Quartz Fluid Pipe
-    gatherable: true
-
-item: Quartz Kinesis Pipe
-    gatherable: true
-
-item: Quartz OR Gate
-    gatherable: true
-
-item: Quartz OR Gate (Autarchic Pulsar)
-    gatherable: true
-
-item: Quartz OR Gate (Clock Timer)
-    gatherable: true
-
-item: Quartz OR Gate (Redstone Fader)
-    gatherable: true
-
-item: Quartz Transport Pipe
-    recipe:
-        input: Block of Quartz, Glass
-        pattern: 010 ... ...
-
-item: Red Pipe Wire
-    gatherable: true
-
-item: Redstone Board (Bomber)
-    recipe:
-        input: Paper, Redstone
-        pattern: 000 010 000
-
-item: Redstone Board (Builder)
-    gatherable: true
-
-item: Redstone Board (Butcher)
-    gatherable: true
-
-item: Redstone Board (Carrier)
-    gatherable: true
-
-item: Redstone Board (Crafter)
-    gatherable: true
-
-item: Redstone Board (Delivery)
-    gatherable: true
-
-item: Redstone Board (Farmer)
-    gatherable: true
-
-item: Redstone Board (Harvester)
-    gatherable: true
-
-item: Redstone Board (Knight)
-    gatherable: true
-
-item: Redstone Board (Leaf Cutter)
-    gatherable: true
-
-item: Redstone Board (Lumberjack)
-    gatherable: true
-
-item: Redstone Board (Miner)
-    gatherable: true
-
-item: Redstone Board (Picker)
-    gatherable: true
-
-item: Redstone Board (Planter)
-    gatherable: true
-
-item: Redstone Board (Pump)
-    gatherable: true
-
-item: Redstone Board (Shovelman)
-    gatherable: true
-
-item: Redstone Board (Stripes)
-    gatherable: true
-
-item: Redstone Board (Tank)
-    gatherable: true
-
-item: Redstone Chipset
-    gatherable: true
-
-item: Redstone Comp Chipset
-    gatherable: true
-
-item: Redstone Crystal
-    gatherable: true
-
-item: Redstone Engine
-    recipe:
-        input: Glass, Oak Wood Planks, Piston, Wood Gear
-        pattern: 111 .0. 323
-
-item: Refinery
-    recipe:
-        input: Diamond Gear, Redstone Torch, Tank
-        pattern: 121 202 ...
-
-item: Requester
-    recipe:
-        input: Chest, Iron Gear, Iron Ingot, Piston, Redstone
-        pattern: 232 101 242
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot
-    gatherable: true
-
-item: Robot (Bomber)
-    recipe:
-        input: Diamond Chipset, Iron Ingot, Redstone Crystal
-        pattern: 111 121 0.0
-
-item: Robot (Builder)
-    gatherable: true
-
-item: Robot (Butcher)
-    gatherable: true
-
-item: Robot (Carrier)
-    gatherable: true
-
-item: Robot (Crafter)
-    gatherable: true
-
-item: Robot (Delivery)
-    gatherable: true
-
-item: Robot (Farmer)
-    gatherable: true
-
-item: Robot (Harvester)
-    gatherable: true
-
-item: Robot (Knight)
-    gatherable: true
-
-item: Robot (Leaf Cutter)
-    gatherable: true
-
-item: Robot (Lumberjack)
-    gatherable: true
-
-item: Robot (Miner)
-    gatherable: true
-
-item: Robot (Picker)
-    gatherable: true
-
-item: Robot (Planter)
-    gatherable: true
-
-item: Robot (Pump)
-    gatherable: true
-
-item: Robot (Shovelman)
-    gatherable: true
-
-item: Robot (Stripes)
-    gatherable: true
-
-item: Robot (Tank)
-    gatherable: true
-
-item: Sandstone Fluid Pipe
-    gatherable: true
-
-item: Sandstone Kinesis Pipe
-    gatherable: true
-
-item: Sandstone Transport Pipe
-    recipe:
-        input: Glass, Sandstone
-        pattern: 101 ... ...
-
-item: Stirling Engine
-    recipe:
-        input: Cobblestone, Glass, Piston, Stone Gear
-        pattern: 000 .1. 323
-
-item: Stone Facade
-    gatherable: true
-
-item: Stone Fluid Pipe
-    gatherable: true
-
-item: Stone Gear
-    recipe:
-        input: Cobblestone, Wood Gear
-        pattern: .0. 010 .0.
-
-item: Stone Hollow Facade
-    gatherable: true
-
-item: Stone Kinesis Pipe
-    gatherable: true
-
-item: Stone Transport Pipe
-    recipe:
-        input: Glass, Stone
-        pattern: 101 ... ...
-
-item: Stripes Transport Pipe
-    recipe:
-        input: Glass, Gold Gear
-        pattern: 101 ... ...
-
-item: Tank
-    recipe:
-        input: Glass
-        pattern: 000 0.0 000
-
-item: Template
-    recipe:
-        input: Ink Sac, Paper
-        pattern: 111 101 111
-
-item: Void Fluid Pipe
-    gatherable: true
-
-item: Void Transport Pipe
-    recipe:
-        input: Glass, Ink Sac, Redstone
-        pattern: 102 ... ...
-
-item: Wood Gear
-    recipe:
-        input: Stick
-        pattern: .0. 0.0 .0.
-
-item: Wooden Fluid Pipe
-    gatherable: true
-
-item: Wooden Kinesis Pipe
-    gatherable: true
-
-item: Wooden Transport Pipe
-    recipe:
-        input: Glass, Oak Wood Planks
-        pattern: 101 ... ...
-
-item: Wrench
-    recipe:
-        input: Iron Ingot, Stone Gear
-        pattern: 0.0 .1. .0.
-
-item: Yellow Pipe Wire
-    gatherable: true
-
-item: Zone Planner
-    recipe:
-        input: Diamond Gear, Empty Map, Gold Gear, Iron Ingot, Redstone
-        pattern: 343 212 303
-
diff --git a/package.json b/package.json
index 4e6f2e94..ea6af484 100644
--- a/package.json
+++ b/package.json
@@ -28,8 +28,7 @@
     "backbone": "^1.1.2",
     "chai": "^2.2.0",
     "coffee-script": "^1.9.2",
-    "crafting-guide": "^3.0.0",
-    "crafting-guide-common": "^1.3.0",
+    "crafting-guide-common": "file:../crafting-guide-common",
     "fs-extra": "^0.30.0",
     "grunt": "^0.4.5",
     "grunt-contrib-clean": "^1.0.0",
diff --git a/test/data.test.coffee b/test/data.test.coffee
index 9f32eb4a..11f1d161 100644
--- a/test/data.test.coffee
+++ b/test/data.test.coffee
@@ -1,15 +1,16 @@
-###
-Crafting Guide - data.test.coffee
+#
+# Crafting Guide Data - data.test.coffee
+#
+# Copyright (c) 2015-2017 by Redwood Labs
+# All rights reserved.
+#
 
-Copyright (c) 2015 by Redwood Labs
-All rights reserved.
-###
-
-{Mod}              = require 'crafting-guide'
-{ModParser}        = require 'crafting-guide'
-{ModVersion}       = require 'crafting-guide'
-{ModVersionParser} = require 'crafting-guide'
-fs                 = require 'fs'
+CraftingGuideCommon = require "crafting-guide-common"
+Mod                 = CraftingGuideCommon.deprecated.game.Mod
+ModParser           = CraftingGuideCommon.deprecated.parsing.ModParser
+ModVersion          = CraftingGuideCommon.deprecated.game.ModVersion
+ModVersionParser    = CraftingGuideCommon.deprecated.parsing.ModVersionParser
+fs                  = require 'fs'
 
 ########################################################################################################################
 
@@ -50,4 +51,4 @@ describe 'data files for', ->
                             it 'loads mod-version.cg without errors', ->
                                 modVersionParser.errors.should.eql []
                                 _.keys(modVersion._items).length.should.be.greaterThan 0
-                                _.keys(modVersion._recipes).length.should.be.greaterThan 0
\ No newline at end of file
+                                _.keys(modVersion._recipes).length.should.be.greaterThan 0
diff --git a/test/event_recorder.coffee b/test/event_recorder.coffee
deleted file mode 100644
index 973cd4af..00000000
--- a/test/event_recorder.coffee
+++ /dev/null
@@ -1,28 +0,0 @@
-###
-# Crafting Guide - event_recorder.coffee
-#
-# Copyright (c) 2014-2015 by Redwood Labs
-# All rights reserved.
-###
-
-util = require 'util'
-
-########################################################################################################################
-
-module.exports = class EventRecorder
-
-    constructor: (model)->
-        if not model? then throw new Error 'model is required'
-
-        @model = model
-        @events = []
-
-        Object.defineProperty this, 'names', get:-> e.event for e in @events
-
-        @model.on 'all', (event, model, args...)=>
-            logger.verbose -> "#{model?.constructor?.name}(#{model?.cid}) emitted #{event}
-                with args: #{util.inspect(args)}"
-            @events.push id:model?.cid, event:event, args:args
-
-    reset: ->
-        @events = []
diff --git a/test/test_helper.coffee b/test/test_helper.coffee
index 5d76c934..c106377c 100644
--- a/test/test_helper.coffee
+++ b/test/test_helper.coffee
@@ -1,9 +1,9 @@
-###
+#
 # Crafting Guide - test.coffee
 #
-# Copyright (c) 2014-2015 by Redwood Labs
+# Copyright (c) 2014-2017 by Redwood Labs
 # All rights reserved.
-###
+#
 
 # Test Set-up ##########################################################################################################
 
@@ -20,5 +20,5 @@ global.util     = require 'util'
 global.w        = require 'when'
 global.window   = {}
 
-{Logger}      = require 'crafting-guide-common'
+Logger = require('crafting-guide-common').util.Logger
 global.logger = new Logger level:Logger.FATAL