Merge "Create new directory to move ServiceWatcher into"