sample server cleanup & new watcher (#43)

Reorganized the sample servers into a unified directory.
Update the legacy k8s watcher to the new version.