Move everything to be based off /srv

Change-Id: I4020af5e05e9b15ca22b2fe25bf6bf3b65c306fd