Separate the path gathering from watch creation