UPDATE: sample REST services and re-org of code structure