Adding changes to ViewOrganization.
Moved DataMapping into LucidEdge.