Move service specs out

Change-Id: Ica8145d049c6157f5ed3ec76dc905d02ab465737