Major overhaul of entity/mapper architecture. Added interface for mapper and moved all service related objects to the service files. Also added service factories to replace closures in the config file