minor cleanup
INTEGRATE-41: rearranged project to share code
INTEGRATE-41: added run next code; refactored poorly named 'service'
classes to 'dao' classes