Restore Services folder after unsuccessful move

Change-Id: If95e9c1b66bd64c1989243bc1590b332dc3c9e20