Fixed up the directory structure and renamed to ServiceControl