jiraId:MAR-542 restructured models
jiraId:MAR-5959 hook up REST service