Watch and Router changes
- Router URL building
- Refactored some parts of Watch
- Initial tests for Watch