Move snapshots out from services
Use options object for watch
Move stats gathering function to services/index
Minor refactoring