Get rid of the "Servers" directory.

Change-Id: Ief8d61f9e26b66ca34cf5e14734b829134c3a3b4