refactoring the watch service reflection code and making them OS specific again