Edited EntityItem and GraniteEntityItem. Also updated mappings and moved them in to "item" packages under entity.