Merge "Changing directory structure for Cinder clients"