Code generator passing specs

I merged in master and restored the service_directory file