Merge "Move watcheditem classes to watcheditem directory"