feat(app): Separate client and server watchers
Merge pull request #16 from jeef3/separate-watchers

Separate client and server watchers