fix storage paths

Change-Id: Idfefc7a59e155366576fe78db3c76bdc53535831