refactored to include a common dir for the common data model

Signed-off-by: Tom Everett <tome@criticalmass.com>