Move things around. Delete tiered storage.

Change-Id: Id7b78a4c60ae202abaa302e9bd993956548470ef
Remove remote storage.

Change-Id: Ie5167b9b89f2bb8816f316fe5df7a6c29c96f4f3