Starting work on watch simulator. Directories reorganized to reflect.